thinkwork-cli 0.1.0 → 0.1.1

package/README.md

@@ -1,17 +1,17 @@
-# @thinkwork-ai/cli
+# thinkwork-cli
 
 Deploy and manage Thinkwork AI agent stacks on AWS.
 
 ## Install
 
 ```bash
-npm install -g @thinkwork-ai/cli
+npm install -g thinkwork-cli
 ```
 
 Or run without installing:
 
 ```bash
-npx @thinkwork-ai/cli --help
+npx thinkwork-cli --help
 ```
 
 ## Quick Start

package/dist/cli.js

@@ -713,43 +713,76 @@ import { existsSync as existsSync3, mkdirSync, writeFileSync as writeFileSync2 }
 import { resolve as resolve2, join } from "path";
 import { execSync as execSync4 } from "child_process";
 import { createInterface as createInterface3 } from "readline";
+import chalk3 from "chalk";
 function ask2(prompt, defaultVal = "") {
   const rl = createInterface3({ input: process.stdin, output: process.stdout });
-  const suffix = defaultVal ? ` [${defaultVal}]` : "";
+  const suffix = defaultVal ? chalk3.dim(` [${defaultVal}]`) : "";
   return new Promise((resolve3) => {
-    rl.question(`${prompt}${suffix}: `, (answer) => {
+    rl.question(`  ${prompt}${suffix}: `, (answer) => {
       rl.close();
       resolve3(answer.trim() || defaultVal);
     });
   });
 }
-function generatePassword() {
-  const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%";
-  let pw = "";
-  const bytes = new Uint8Array(32);
+function choose(prompt, options, defaultVal) {
+  const optStr = options.map((o) => o === defaultVal ? chalk3.bold(o) : chalk3.dim(o)).join(" / ");
+  return ask2(`${prompt} (${optStr})`, defaultVal);
+}
+function generateSecret(length = 32) {
+  const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+  let result = "";
+  const bytes = new Uint8Array(length);
   globalThis.crypto.getRandomValues(bytes);
-  for (const b of bytes) pw += chars[b % chars.length];
-  return pw;
+  for (const b of bytes) result += chars[b % chars.length];
+  return result;
+}
+function buildTfvars(config) {
+  const lines = [
+    `# Thinkwork \u2014 ${config.stage} stage`,
+    `# Generated by: thinkwork init -s ${config.stage}`,
+    `# ${(/* @__PURE__ */ new Date()).toISOString().split("T")[0]}`,
+    ``,
+    `# \u2500\u2500 Core \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`,
+    `stage      = "${config.stage}"`,
+    `region     = "${config.region}"`,
+    `account_id = "${config.account_id}"`,
+    ``,
+    `# \u2500\u2500 Database \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`,
+    `database_engine = "${config.database_engine}"`,
+    `db_password     = "${config.db_password}"`,
+    ``,
+    `# \u2500\u2500 Memory \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`,
+    `memory_engine = "${config.memory_engine}"`,
+    ``,
+    `# \u2500\u2500 Auth \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`,
+    `api_auth_secret = "${config.api_auth_secret}"`
+  ];
+  if (config.google_oauth_client_id) {
+    lines.push(``);
+    lines.push(`# \u2500\u2500 Google OAuth \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`);
+    lines.push(`google_oauth_client_id     = "${config.google_oauth_client_id}"`);
+    lines.push(`google_oauth_client_secret = "${config.google_oauth_client_secret}"`);
+  } else {
+    lines.push(``);
+    lines.push(`# \u2500\u2500 Google OAuth (uncomment to enable Google social login) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`);
+    lines.push(`# google_oauth_client_id     = ""`);
+    lines.push(`# google_oauth_client_secret = ""`);
+  }
+  if (config.admin_url && config.admin_url !== "http://localhost:5174") {
+    lines.push(``);
+    lines.push(`# \u2500\u2500 Callback URLs \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`);
+    lines.push(`admin_callback_urls  = ["${config.admin_url}", "${config.admin_url}/auth/callback"]`);
+    lines.push(`admin_logout_urls    = ["${config.admin_url}"]`);
+  }
+  if (config.mobile_scheme && config.mobile_scheme !== "thinkwork") {
+    lines.push(`mobile_callback_urls = ["${config.mobile_scheme}://", "${config.mobile_scheme}://auth/callback"]`);
+    lines.push(`mobile_logout_urls   = ["${config.mobile_scheme}://"]`);
+  }
+  lines.push(``);
+  return lines.join("\n");
 }
-var TFVARS_TEMPLATE = `# Thinkwork \u2014 {STAGE} stage
-# Generated by: thinkwork init -s {STAGE}
-
-stage      = "{STAGE}"
-region     = "{REGION}"
-account_id = "{ACCOUNT_ID}"
-
-# Database
-database_engine = "aurora-serverless"
-db_password = "{DB_PASSWORD}"
-
-# Memory engine: "managed" (built-in) or "hindsight" (ECS Fargate service)
-memory_engine = "{MEMORY_ENGINE}"
-
-# API authentication secret (shared between services)
-api_auth_secret = "{API_SECRET}"
-`;
 function registerInitCommand(program2) {
-  program2.command("init").description("Initialize a new Thinkwork environment").requiredOption("-s, --stage <name>", "Stage name (e.g. dev, staging, prod)").option("-d, --dir <path>", "Directory to initialize in", ".").action(async (opts) => {
+  program2.command("init").description("Initialize a new Thinkwork environment").requiredOption("-s, --stage <name>", "Stage name (e.g. dev, staging, prod)").option("-d, --dir <path>", "Directory to initialize in", ".").option("--defaults", "Skip interactive prompts, use all defaults").action(async (opts) => {
     const stageCheck = validateStage(opts.stage);
     if (!stageCheck.valid) {
       printError(stageCheck.error);
@@ -766,38 +799,88 @@ function registerInitCommand(program2) {
     const tfvarsPath = join(tfDir, "terraform.tfvars");
     if (existsSync3(tfvarsPath)) {
       printWarning(`terraform.tfvars already exists at ${tfvarsPath}`);
-      const overwrite = await ask2("  Overwrite? [y/N]");
+      const overwrite = await ask2("Overwrite?", "N");
       if (overwrite.toLowerCase() !== "y") {
         console.log("  Aborted.");
         return;
       }
+      console.log("");
+    }
+    const config = {
+      stage: opts.stage,
+      account_id: identity.account,
+      db_password: generateSecret(24),
+      api_auth_secret: `tw-${opts.stage}-${generateSecret(16)}`
+    };
+    if (opts.defaults) {
+      config.region = identity.region !== "unknown" ? identity.region : "us-east-1";
+      config.database_engine = "aurora-serverless";
+      config.memory_engine = "managed";
+      config.google_oauth_client_id = "";
+      config.google_oauth_client_secret = "";
+      config.admin_url = "http://localhost:5174";
+      config.mobile_scheme = "thinkwork";
+    } else {
+      console.log(chalk3.bold("  Configure your Thinkwork environment\n"));
+      const defaultRegion = identity.region !== "unknown" ? identity.region : "us-east-1";
+      config.region = await ask2("AWS Region", defaultRegion);
+      console.log("");
+      console.log(chalk3.dim("  \u2500\u2500 Database \u2500\u2500"));
+      config.database_engine = await choose("Database engine", ["aurora-serverless", "rds-postgres"], "aurora-serverless");
+      console.log("");
+      console.log(chalk3.dim("  \u2500\u2500 Memory \u2500\u2500"));
+      console.log(chalk3.dim("  managed    = Built-in AgentCore memory (remember/recall/forget)"));
+      console.log(chalk3.dim("  hindsight  = ECS Fargate service with semantic + graph retrieval"));
+      config.memory_engine = await choose("Memory engine", ["managed", "hindsight"], "managed");
+      console.log("");
+      console.log(chalk3.dim("  \u2500\u2500 Auth \u2500\u2500"));
+      const useGoogle = await ask2("Enable Google OAuth login? (y/N)", "N");
+      if (useGoogle.toLowerCase() === "y") {
+        config.google_oauth_client_id = await ask2("Google OAuth Client ID");
+        config.google_oauth_client_secret = await ask2("Google OAuth Client Secret");
+      } else {
+        config.google_oauth_client_id = "";
+        config.google_oauth_client_secret = "";
+      }
+      console.log("");
+      console.log(chalk3.dim("  \u2500\u2500 Frontend URLs \u2500\u2500"));
+      config.admin_url = await ask2("Admin UI URL", "http://localhost:5174");
+      config.mobile_scheme = await ask2("Mobile app URL scheme", "thinkwork");
+      console.log("");
+      console.log(chalk3.dim("  \u2500\u2500 Secrets (auto-generated) \u2500\u2500"));
+      console.log(chalk3.dim(`  DB password:     ${config.db_password.slice(0, 8)}...`));
+      console.log(chalk3.dim(`  API auth secret: ${config.api_auth_secret.slice(0, 16)}...`));
     }
-    console.log("  Configure your Thinkwork environment:\n");
-    const region = await ask2("  AWS Region", identity.region !== "unknown" ? identity.region : "us-east-1");
-    const memoryEngine = await ask2("  Memory engine (managed/hindsight)", "managed");
-    const dbPassword = generatePassword();
-    const apiSecret = `tw-${opts.stage}-${generatePassword().slice(0, 12)}`;
     if (!existsSync3(tfDir)) {
       mkdirSync(tfDir, { recursive: true });
     }
-    const tfvars = TFVARS_TEMPLATE.replace(/{STAGE}/g, opts.stage).replace(/{REGION}/g, region).replace(/{ACCOUNT_ID}/g, identity.account).replace(/{DB_PASSWORD}/g, dbPassword).replace(/{MEMORY_ENGINE}/g, memoryEngine).replace(/{API_SECRET}/g, apiSecret);
+    const tfvars = buildTfvars(config);
     writeFileSync2(tfvarsPath, tfvars);
-    console.log(`
-  Wrote ${tfvarsPath}`);
+    console.log("");
+    console.log(`  Wrote ${chalk3.cyan(tfvarsPath)}`);
+    console.log("");
+    console.log(chalk3.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    console.log(`  ${chalk3.bold("Stage:")}           ${config.stage}`);
+    console.log(`  ${chalk3.bold("Region:")}          ${config.region}`);
+    console.log(`  ${chalk3.bold("Account:")}         ${config.account_id}`);
+    console.log(`  ${chalk3.bold("Database:")}        ${config.database_engine}`);
+    console.log(`  ${chalk3.bold("Memory:")}          ${config.memory_engine}`);
+    console.log(`  ${chalk3.bold("Google OAuth:")}    ${config.google_oauth_client_id ? "enabled" : "disabled"}`);
+    console.log(chalk3.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
     console.log("\n  Initializing Terraform...\n");
     try {
       execSync4("terraform init", { cwd: tfDir, stdio: "inherit" });
     } catch {
-      printWarning("Terraform init failed \u2014 you may need to install Terraform first.");
-      printWarning("Run: thinkwork doctor -s " + opts.stage);
+      printWarning("Terraform init failed. Run `thinkwork doctor -s " + opts.stage + "` to check prerequisites.");
       return;
     }
     printSuccess(`Environment "${opts.stage}" initialized`);
     console.log("");
     console.log("  Next steps:");
-    console.log(`    1. thinkwork plan -s ${opts.stage}        # Review the plan`);
-    console.log(`    2. thinkwork deploy -s ${opts.stage}       # Deploy infrastructure`);
-    console.log(`    3. thinkwork bootstrap -s ${opts.stage}    # Seed workspace + skills`);
+    console.log(`    ${chalk3.cyan("1.")} thinkwork plan -s ${opts.stage}        ${chalk3.dim("# Review infrastructure plan")}`);
+    console.log(`    ${chalk3.cyan("2.")} thinkwork deploy -s ${opts.stage}       ${chalk3.dim("# Deploy to AWS")}`);
+    console.log(`    ${chalk3.cyan("3.")} thinkwork bootstrap -s ${opts.stage}    ${chalk3.dim("# Seed workspace files + skills")}`);
+    console.log(`    ${chalk3.cyan("4.")} thinkwork outputs -s ${opts.stage}      ${chalk3.dim("# Show API URL, Cognito IDs, etc.")}`);
     console.log("");
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkwork-cli",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Thinkwork CLI — deploy, manage, and interact with your Thinkwork stack",
   "license": "MIT",
   "type": "module",