agdi 3.3.7 → 3.3.8

package/dist/index.js

@@ -11,7 +11,7 @@ import "./chunk-4VNS5WPM.js";
 
 // src/index.ts
 import { Command } from "commander";
-import chalk18 from "chalk";
+import chalk21 from "chalk";
 import ora7 from "ora";
 
 // src/core/llm/index.ts
@@ -3527,80 +3527,80 @@ var TypeScriptParser = class extends CodeParser {
       const dependencies = /* @__PURE__ */ new Set();
       traverse(ast, {
         // Functions
-        FunctionDeclaration(path14) {
-          if (path14.node.id) {
+        FunctionDeclaration(path15) {
+          if (path15.node.id) {
             symbols.push({
-              name: path14.node.id.name,
+              name: path15.node.id.name,
               type: "function",
-              line: path14.node.loc?.start.line || 0,
-              endLine: path14.node.loc?.end.line,
-              signature: generateSignature(path14.node),
-              isExported: isExported(path14),
-              docstring: extractDocstring(path14.node)
+              line: path15.node.loc?.start.line || 0,
+              endLine: path15.node.loc?.end.line,
+              signature: generateSignature(path15.node),
+              isExported: isExported(path15),
+              docstring: extractDocstring(path15.node)
             });
           }
         },
         // Classes
-        ClassDeclaration(path14) {
-          if (path14.node.id) {
+        ClassDeclaration(path15) {
+          if (path15.node.id) {
             symbols.push({
-              name: path14.node.id.name,
+              name: path15.node.id.name,
               type: "class",
-              line: path14.node.loc?.start.line || 0,
-              endLine: path14.node.loc?.end.line,
-              signature: `class ${path14.node.id.name}`,
-              isExported: isExported(path14),
-              docstring: extractDocstring(path14.node)
+              line: path15.node.loc?.start.line || 0,
+              endLine: path15.node.loc?.end.line,
+              signature: `class ${path15.node.id.name}`,
+              isExported: isExported(path15),
+              docstring: extractDocstring(path15.node)
             });
           }
         },
         // Variables (const/let/var)
-        VariableDeclaration(path14) {
-          path14.node.declarations.forEach((decl) => {
+        VariableDeclaration(path15) {
+          path15.node.declarations.forEach((decl) => {
             if (t.isIdentifier(decl.id)) {
               symbols.push({
                 name: decl.id.name,
                 type: "variable",
-                line: path14.node.loc?.start.line || 0,
-                endLine: path14.node.loc?.end.line,
-                signature: `${path14.node.kind} ${decl.id.name}`,
-                isExported: isExported(path14),
-                docstring: extractDocstring(path14.node)
+                line: path15.node.loc?.start.line || 0,
+                endLine: path15.node.loc?.end.line,
+                signature: `${path15.node.kind} ${decl.id.name}`,
+                isExported: isExported(path15),
+                docstring: extractDocstring(path15.node)
               });
             }
           });
         },
         // Interfaces
-        TSInterfaceDeclaration(path14) {
+        TSInterfaceDeclaration(path15) {
           symbols.push({
-            name: path14.node.id.name,
+            name: path15.node.id.name,
             type: "interface",
-            line: path14.node.loc?.start.line || 0,
-            endLine: path14.node.loc?.end.line,
-            signature: `interface ${path14.node.id.name}`,
-            isExported: isExported(path14),
-            docstring: extractDocstring(path14.node)
+            line: path15.node.loc?.start.line || 0,
+            endLine: path15.node.loc?.end.line,
+            signature: `interface ${path15.node.id.name}`,
+            isExported: isExported(path15),
+            docstring: extractDocstring(path15.node)
           });
         },
         // Types
-        TSTypeAliasDeclaration(path14) {
+        TSTypeAliasDeclaration(path15) {
           symbols.push({
-            name: path14.node.id.name,
+            name: path15.node.id.name,
             type: "type",
-            line: path14.node.loc?.start.line || 0,
-            endLine: path14.node.loc?.end.line,
-            signature: `type ${path14.node.id.name}`,
-            isExported: isExported(path14),
-            docstring: extractDocstring(path14.node)
+            line: path15.node.loc?.start.line || 0,
+            endLine: path15.node.loc?.end.line,
+            signature: `type ${path15.node.id.name}`,
+            isExported: isExported(path15),
+            docstring: extractDocstring(path15.node)
           });
         },
         // Imports
-        ImportDeclaration(path14) {
-          const source = path14.node.source.value;
+        ImportDeclaration(path15) {
+          const source = path15.node.source.value;
           dependencies.add(source);
           const names = [];
           let isDefault = false;
-          path14.node.specifiers.forEach((specifier) => {
+          path15.node.specifiers.forEach((specifier) => {
             if (t.isImportDefaultSpecifier(specifier)) {
               isDefault = true;
               names.push(specifier.local.name);
@@ -3618,34 +3618,34 @@ var TypeScriptParser = class extends CodeParser {
             source,
             names,
             isDefault,
-            line: path14.node.loc?.start.line || 0
+            line: path15.node.loc?.start.line || 0
           });
         },
         // Exports
-        ExportNamedDeclaration(path14) {
-          if (path14.node.declaration) {
+        ExportNamedDeclaration(path15) {
+          if (path15.node.declaration) {
           } else {
-            path14.node.specifiers.forEach((specifier) => {
+            path15.node.specifiers.forEach((specifier) => {
               exports.push({
                 name: specifier.exported.name,
                 type: "named",
-                line: path14.node.loc?.start.line || 0
+                line: path15.node.loc?.start.line || 0
               });
             });
           }
-          if (path14.node.source) {
-            dependencies.add(path14.node.source.value);
+          if (path15.node.source) {
+            dependencies.add(path15.node.source.value);
           }
         },
-        ExportDefaultDeclaration(path14) {
+        ExportDefaultDeclaration(path15) {
           let name = "default";
-          if (path14.node.declaration && path14.node.declaration.id) {
-            name = path14.node.declaration.id.name;
+          if (path15.node.declaration && path15.node.declaration.id) {
+            name = path15.node.declaration.id.name;
           }
           exports.push({
             name,
             type: "default",
-            line: path14.node.loc?.start.line || 0
+            line: path15.node.loc?.start.line || 0
           });
         }
       });
@@ -3682,8 +3682,8 @@ var TypeScriptParser = class extends CodeParser {
     return ["ts", "tsx", "js", "jsx", "mjs", "cjs"];
   }
 };
-function isExported(path14) {
-  return t.isExportDeclaration(path14.parent) || t.isExportNamedDeclaration(path14.parent) || t.isExportDefaultDeclaration(path14.parent);
+function isExported(path15) {
+  return t.isExportDeclaration(path15.parent) || t.isExportNamedDeclaration(path15.parent) || t.isExportDefaultDeclaration(path15.parent);
 }
 function extractDocstring(node) {
   if (node.leadingComments && node.leadingComments.length > 0) {
@@ -3784,24 +3784,24 @@ var DependencyGraph = class {
     const cycles = [];
     const visited = /* @__PURE__ */ new Set();
     const recursionStack = /* @__PURE__ */ new Set();
-    const path14 = [];
+    const path15 = [];
     const dfs = (file) => {
       visited.add(file);
       recursionStack.add(file);
-      path14.push(file);
+      path15.push(file);
       const node = this.nodes.get(file);
       if (node) {
         for (const dep of node.imports) {
           if (!visited.has(dep)) {
             dfs(dep);
           } else if (recursionStack.has(dep)) {
-            const cycleStart = path14.indexOf(dep);
-            const cycle = path14.slice(cycleStart);
+            const cycleStart = path15.indexOf(dep);
+            const cycle = path15.slice(cycleStart);
             cycles.push([...cycle, dep]);
           }
         }
       }
-      path14.pop();
+      path15.pop();
       recursionStack.delete(file);
     };
     for (const file of this.nodes.keys()) {
@@ -3845,8 +3845,8 @@ var DependencyGraph = class {
   /**
    * Normalize path (remove .., etc.)
    */
-  normalizePath(path14) {
-    const parts = path14.split("/");
+  normalizePath(path15) {
+    const parts = path15.split("/");
     const result = [];
     for (const part of parts) {
       if (part === "..") {
@@ -4057,22 +4057,22 @@ var VectorStore = class {
   /**
    * Get stored hash for a file
    */
-  async getFileHash(path14) {
+  async getFileHash(path15) {
     await this.initialize();
     if (!this.db) return null;
-    const row = this.db.prepare("SELECT hash FROM indexed_files WHERE path = ?").get(path14);
+    const row = this.db.prepare("SELECT hash FROM indexed_files WHERE path = ?").get(path15);
     return row ? row.hash : null;
   }
   /**
    * Set/Update hash for a file
    */
-  async setFileHash(path14, hash) {
+  async setFileHash(path15, hash) {
     await this.initialize();
     if (!this.db) return;
     this.db.prepare(`
             INSERT OR REPLACE INTO indexed_files (path, hash, last_indexed)
             VALUES (?, ?, ?)
-        `).run(path14, hash, Date.now());
+        `).run(path15, hash, Date.now());
   }
   /**
    * Add embeddings to store
@@ -5236,8 +5236,8 @@ function parseGitHubUrl(url) {
   if (!cleanUrl.startsWith("github.com/")) {
     throw new Error("Invalid GitHub URL. Please use format: https://github.com/owner/repo");
   }
-  const path14 = cleanUrl.replace("github.com/", "");
-  const parts = path14.split("/");
+  const path15 = cleanUrl.replace("github.com/", "");
+  const parts = path15.split("/");
   if (parts.length < 2) {
     throw new Error("Invalid GitHub URL. Could not extract owner/repo.");
   }
@@ -5662,7 +5662,38 @@ var FILE_COPY_TARGETS = [
   { source: "src/channels/allowlist-match.ts", target: "src/channels/allowlist-match.ts" },
   { source: "src/channels/channel-config.ts", target: "src/channels/channel-config.ts" }
 ];
+var ALL_DIRECTORY_COPY_TARGETS = [
+  { source: "dist", target: "dist" },
+  { source: "skills", target: "skills" },
+  { source: "extensions", target: "extensions" },
+  { source: "src", target: "src" },
+  { source: "scripts", target: "scripts" },
+  { source: "docs", target: "docs" },
+  { source: "test", target: "test" },
+  { source: "apps", target: "apps" },
+  { source: "assets", target: "assets" },
+  { source: "prisma", target: "prisma" },
+  { source: "ui", target: "ui" },
+  { source: "vendor", target: "vendor" },
+  { source: "website", target: "website" }
+];
+var ALL_FILE_COPY_TARGETS = [
+  { source: "agdi.mjs", target: "agdi.mjs" },
+  { source: "README.md", target: "README.md" },
+  { source: "LICENSE", target: "LICENSE" },
+  { source: "CHANGELOG.md", target: "CHANGELOG.md" },
+  { source: "SECURITY.md", target: "SECURITY.md" },
+  { source: "CONTRIBUTING.md", target: "CONTRIBUTING.md" },
+  { source: "pnpm-lock.yaml", target: "pnpm-lock.yaml" },
+  { source: "pnpm-workspace.yaml", target: "pnpm-workspace.yaml" },
+  { source: "tsconfig.json", target: "tsconfig.json" },
+  { source: "tsconfig.test.json", target: "tsconfig.test.json" },
+  { source: "vitest.config.ts", target: "vitest.config.ts" },
+  { source: "vitest.e2e.config.ts", target: "vitest.e2e.config.ts" },
+  { source: "vitest.unit.config.ts", target: "vitest.unit.config.ts" }
+];
 var EXCLUDED_PATH_SEGMENTS = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", ".next"]);
+var EXCLUDED_ALL_PATH_SEGMENTS = /* @__PURE__ */ new Set(["node_modules", ".git", ".next"]);
 function shouldIncludePath(filePath) {
   const normalized = filePath.replace(/\\/g, "/").toLowerCase();
   const segments = normalized.split("/");
@@ -5691,6 +5722,68 @@ async function copyTargetPaths(sourceRepo, targetRoot) {
     await fsExtra.copy(sourcePath, targetPath, { overwrite: true });
   }
 }
+function shouldIncludeAllPath(filePath) {
+  const normalized = filePath.replace(/\\/g, "/").toLowerCase();
+  const segments = normalized.split("/");
+  return !segments.some((segment) => EXCLUDED_ALL_PATH_SEGMENTS.has(segment));
+}
+async function copyAllTargetPaths(sourceRepo, targetRoot) {
+  for (const target of ALL_DIRECTORY_COPY_TARGETS) {
+    const sourcePath = join6(sourceRepo, target.source);
+    const targetPath = join6(targetRoot, target.target);
+    if (!await fsExtra.pathExists(sourcePath)) {
+      continue;
+    }
+    await fsExtra.ensureDir(targetPath);
+    await fsExtra.copy(sourcePath, targetPath, {
+      overwrite: true,
+      filter: (source) => shouldIncludeAllPath(source)
+    });
+  }
+  for (const target of ALL_FILE_COPY_TARGETS) {
+    const sourcePath = join6(sourceRepo, target.source);
+    const targetPath = join6(targetRoot, target.target);
+    if (!await fsExtra.pathExists(sourcePath)) {
+      continue;
+    }
+    await fsExtra.ensureDir(join6(targetPath, ".."));
+    await fsExtra.copy(sourcePath, targetPath, { overwrite: true });
+  }
+}
+async function writeMirrorPackageJson(targetRoot) {
+  const packageJsonPath = join6(targetRoot, "package.json");
+  const packageJson = {
+    name: "agdi-upstream-mirror",
+    private: true,
+    type: "module",
+    description: "Mirrored upstream Agdi feature/runtime surface for Agdi-dev"
+  };
+  await fsExtra.writeJson(packageJsonPath, packageJson, { spaces: 2 });
+}
+async function ensureMirrorNodeModules(sourceRepo, targetRoot) {
+  const sourceNodeModules = join6(sourceRepo, "node_modules");
+  const targetNodeModules = join6(targetRoot, "node_modules");
+  if (!await fsExtra.pathExists(sourceNodeModules)) {
+    return "missing";
+  }
+  try {
+    if (await fsExtra.pathExists(targetNodeModules)) {
+      const stat = await fsExtra.lstat(targetNodeModules);
+      if (stat.isSymbolicLink()) {
+        const existing = await fsExtra.realpath(targetNodeModules);
+        const expected = await fsExtra.realpath(sourceNodeModules);
+        if (existing === expected) {
+          return "linked";
+        }
+      }
+      await fsExtra.remove(targetNodeModules);
+    }
+    await fsExtra.ensureSymlink(sourceNodeModules, targetNodeModules, "junction");
+    return "linked";
+  } catch {
+    return "failed";
+  }
+}
 async function listSkills(targetRoot) {
   const skillsRoot = join6(targetRoot, "skills");
   if (!await fsExtra.pathExists(skillsRoot)) {
@@ -5771,12 +5864,14 @@ async function runFeaturesCommand(options) {
   const sourceRepo = resolve2(cwd, options.from ?? "../Agdi");
   const targetRoot = resolve2(cwd, options.to ?? "./upstream/agdi");
   console.log("");
-  console.log(chalk16.cyan.bold("Feature Packs"));
+  console.log(chalk16.cyan.bold(options.all ? "Feature Mirror" : "Feature Packs"));
   console.log(chalk16.gray(`  Source: ${sourceRepo}`));
   console.log(chalk16.gray(`  Target: ${targetRoot}`));
   console.log("");
   if (options.sync) {
-    const spinner = ora6("Syncing feature packs from Agdi...").start();
+    const spinner = ora6(
+      options.all ? "Syncing full upstream Agdi mirror..." : "Syncing feature packs from Agdi..."
+    ).start();
     if (!await fsExtra.pathExists(sourceRepo)) {
       spinner.fail("Source Agdi repository not found");
       console.log(chalk16.red(`Expected source path: ${sourceRepo}`));
@@ -5784,8 +5879,24 @@ async function runFeaturesCommand(options) {
     }
     try {
       await fsExtra.ensureDir(targetRoot);
-      await copyTargetPaths(sourceRepo, targetRoot);
+      let nodeModulesStatus = null;
+      if (options.all) {
+        await copyAllTargetPaths(sourceRepo, targetRoot);
+        await writeMirrorPackageJson(targetRoot);
+        nodeModulesStatus = await ensureMirrorNodeModules(sourceRepo, targetRoot);
+      } else {
+        await copyTargetPaths(sourceRepo, targetRoot);
+      }
       spinner.succeed("Sync completed");
+      if (options.all && nodeModulesStatus !== null) {
+        if (nodeModulesStatus === "linked") {
+          console.log(chalk16.gray("  Mirror node_modules: linked to source repo"));
+        } else if (nodeModulesStatus === "missing") {
+          console.log(chalk16.yellow("  Mirror node_modules: source node_modules missing"));
+        } else {
+          console.log(chalk16.yellow("  Mirror node_modules: failed to link (proxy commands may fail)"));
+        }
+      }
     } catch (error) {
       spinner.fail("Sync failed");
       const message = error instanceof Error ? error.message : String(error);
@@ -5807,6 +5918,14 @@ async function runFeaturesCommand(options) {
   console.log(chalk16.gray(`  Pairing TS files: ${pairingTs}`));
   console.log(chalk16.gray(`  Channel policy TS files: ${channelPolicyTs}`));
   console.log("");
+  if (options.all) {
+    const hasRuntimeEntry = await fsExtra.pathExists(join6(targetRoot, "agdi.mjs"));
+    const hasRuntimeDist = await fsExtra.pathExists(join6(targetRoot, "dist/entry.js"));
+    console.log(chalk16.white.bold("Mirror runtime:"));
+    console.log(chalk16.gray(`  agdi.mjs present: ${hasRuntimeEntry ? "yes" : "no"}`));
+    console.log(chalk16.gray(`  dist/entry.js present: ${hasRuntimeDist ? "yes" : "no"}`));
+    console.log("");
+  }
   if (extensions.length > 0) {
     console.log(chalk16.white.bold("Top extensions:"));
     console.log(chalk16.gray(`  ${extensions.slice(0, 16).join(", ")}`));
@@ -6463,18 +6582,588 @@ async function runChannelsDoctorCommand() {
   console.log("");
 }
 
-// src/index.ts
-var BANNER = `
-${chalk18.cyan(`    ___              __ _  `)}
-${chalk18.cyan(`   /   |  ____ _____/ /(_) `)}
-${chalk18.cyan(`  / /| | / __ \`/ __  // /  `)}
-${chalk18.cyan(` / ___ |/ /_/ / /_/ // /   `)}
-${chalk18.cyan(`/_/  |_|\\_, /\\__,_//_/    `)}
-${chalk18.cyan(`       /____/              `)}
+// src/commands/gateway.ts
+import net from "net";
+import chalk18 from "chalk";
+function resolveGatewayTarget(options) {
+  const host = options.host?.trim() || process.env.AGDI_GATEWAY_HOST || "127.0.0.1";
+  const rawPort = options.port ?? process.env.AGDI_GATEWAY_PORT ?? "18789";
+  const parsed = Number.parseInt(String(rawPort), 10);
+  const port = Number.isFinite(parsed) && parsed > 0 ? parsed : 18789;
+  return { host, port };
+}
+async function checkPortOpen(target) {
+  return new Promise((resolve3) => {
+    const socket = net.createConnection({ host: target.host, port: target.port });
+    let settled = false;
+    const done = (value) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      socket.destroy();
+      resolve3(value);
+    };
+    socket.setTimeout(2e3);
+    socket.once("connect", () => done(true));
+    socket.once("timeout", () => done(false));
+    socket.once("error", () => done(false));
+  });
+}
+async function fetchGatewayHealth(target) {
+  const url = `http://${target.host}:${target.port}/health`;
+  try {
+    const response = await fetch(url, {
+      method: "GET",
+      headers: { Accept: "application/json" }
+    });
+    const body = await response.text();
+    return { ok: response.ok, status: response.status, body };
+  } catch {
+    return { ok: false };
+  }
+}
+async function runGatewayStatusCommand(options) {
+  const target = resolveGatewayTarget(options);
+  const open = await checkPortOpen(target);
+  const health = open ? await fetchGatewayHealth(target) : { ok: false };
+  console.log("");
+  console.log(chalk18.cyan.bold("Gateway Status (native Agdi-dev)"));
+  console.log(chalk18.gray(`  Target: ws://${target.host}:${target.port}`));
+  console.log(chalk18.gray(`  Port open: ${open ? "yes" : "no"}`));
+  if (health.status !== void 0) {
+    console.log(chalk18.gray(`  Health HTTP: ${health.status}`));
+  } else {
+    console.log(chalk18.gray("  Health HTTP: unreachable"));
+  }
+  if (health.body && health.body.trim().length > 0) {
+    const trimmed = health.body.length > 240 ? `${health.body.slice(0, 240)}...` : health.body;
+    console.log(chalk18.gray(`  Health body: ${trimmed}`));
+  }
+  console.log("");
+}
+async function runGatewayHealthCommand(options) {
+  const target = resolveGatewayTarget(options);
+  const health = await fetchGatewayHealth(target);
+  if (!health.ok) {
+    console.log("");
+    console.log(chalk18.red("Gateway health check failed."));
+    console.log(chalk18.gray(`  Target: http://${target.host}:${target.port}/health`));
+    if (health.status !== void 0) {
+      console.log(chalk18.gray(`  Status: ${health.status}`));
+    }
+    console.log("");
+    process.exitCode = 1;
+    return;
+  }
+  console.log("");
+  console.log(chalk18.green.bold("Gateway healthy"));
+  console.log(chalk18.gray(`  Target: http://${target.host}:${target.port}/health`));
+  console.log(chalk18.gray(`  Status: ${health.status}`));
+  if (health.body && health.body.trim().length > 0) {
+    const trimmed = health.body.length > 240 ? `${health.body.slice(0, 240)}...` : health.body;
+    console.log(chalk18.gray(`  Body: ${trimmed}`));
+  }
+  console.log("");
+}
+
+// src/commands/upstream-proxy.ts
+import { spawn as spawn2 } from "child_process";
+import path14 from "path";
+import fs13 from "fs";
+import chalk19 from "chalk";
+var DEFAULT_UPSTREAM_CANDIDATES = (cwd) => {
+  const envRepo = process.env.AGDI_UPSTREAM_REPO?.trim();
+  const envBin = process.env.AGDI_UPSTREAM_BIN?.trim();
+  const candidates = /* @__PURE__ */ new Set();
+  if (envBin) {
+    candidates.add(path14.resolve(cwd, envBin));
+  }
+  if (envRepo) {
+    candidates.add(path14.resolve(cwd, envRepo, "agdi.mjs"));
+  }
+  candidates.add(path14.resolve(cwd, "upstream/agdi/agdi.mjs"));
+  candidates.add(path14.resolve(cwd, "../upstream/agdi/agdi.mjs"));
+  candidates.add(path14.resolve(cwd, "../../upstream/agdi/agdi.mjs"));
+  candidates.add(path14.resolve(cwd, "../../../upstream/agdi/agdi.mjs"));
+  candidates.add(path14.resolve(cwd, "../Agdi/agdi.mjs"));
+  candidates.add(path14.resolve(cwd, "Agdi/agdi.mjs"));
+  candidates.add(path14.resolve(cwd, "../../Agdi/agdi.mjs"));
+  candidates.add(path14.resolve(cwd, "../../../Agdi/agdi.mjs"));
+  candidates.add(path14.resolve(cwd, "../../../../Agdi/agdi.mjs"));
+  return [...candidates];
+};
+function resolveUpstreamBin(cwd = process.cwd()) {
+  for (const candidate of DEFAULT_UPSTREAM_CANDIDATES(cwd)) {
+    if (fs13.existsSync(candidate)) {
+      return candidate;
+    }
+  }
+  return null;
+}
+function extractForwardedArgs(invokedNames) {
+  const raw = process.argv.slice(2);
+  const index = raw.findIndex((token) => invokedNames.includes(token));
+  if (index < 0) {
+    return {
+      invokedName: invokedNames[0],
+      forwarded: []
+    };
+  }
+  return {
+    invokedName: raw[index],
+    forwarded: raw.slice(index + 1)
+  };
+}
+async function runUpstreamProxy(spec) {
+  const upstreamBin = resolveUpstreamBin(process.cwd());
+  if (!upstreamBin) {
+    console.log("");
+    console.log(chalk19.red("Upstream Agdi CLI not found."));
+    console.log(chalk19.gray("Expected one of:"));
+    for (const candidate of DEFAULT_UPSTREAM_CANDIDATES(process.cwd())) {
+      console.log(chalk19.gray(`  - ${candidate}`));
+    }
+    console.log(chalk19.gray("Set AGDI_UPSTREAM_REPO or AGDI_UPSTREAM_BIN to override."));
+    console.log("");
+    process.exitCode = 1;
+    return;
+  }
+  const invocationNames = [spec.name, ...spec.aliases ?? []];
+  const { invokedName, forwarded } = extractForwardedArgs(invocationNames);
+  await new Promise((resolve3) => {
+    const child = spawn2(process.execPath, [upstreamBin, invokedName, ...forwarded], {
+      stdio: "inherit",
+      env: process.env
+    });
+    child.on("error", (error) => {
+      console.log(chalk19.red(`Failed to run upstream command: ${error.message}`));
+      process.exitCode = 1;
+      resolve3();
+    });
+    child.on("exit", (code, signal) => {
+      if (typeof code === "number") {
+        process.exitCode = code;
+      } else if (signal) {
+        console.log(chalk19.red(`Upstream command terminated by signal: ${signal}`));
+        process.exitCode = 1;
+      }
+      resolve3();
+    });
+  });
+}
+var UPSTREAM_PROXY_COMMANDS = [
+  { name: "setup", description: "Upstream setup helpers" },
+  { name: "onboard", description: "Upstream onboarding helpers" },
+  { name: "configure", description: "Upstream interactive configuration wizard" },
+  { name: "dashboard", description: "Open the upstream control dashboard" },
+  { name: "reset", description: "Reset upstream local state/config" },
+  { name: "uninstall", description: "Uninstall upstream local service/data" },
+  { name: "message", description: "Upstream message operations (send/read/manage)" },
+  { name: "memory", description: "Upstream memory commands" },
+  { name: "agent", aliases: ["agents"], description: "Upstream agent management commands" },
+  { name: "status", description: "Upstream gateway status" },
+  { name: "health", description: "Upstream health checks" },
+  { name: "sessions", description: "Upstream sessions management" },
+  { name: "browser", description: "Upstream browser tooling" },
+  { name: "acp", description: "Upstream Agent Control Protocol tooling" },
+  { name: "gateway", description: "Upstream gateway control" },
+  { name: "daemon", description: "Upstream gateway service (legacy alias)" },
+  { name: "logs", description: "Upstream gateway logs" },
+  { name: "system", description: "Upstream system events and presence" },
+  { name: "models", description: "Upstream model configuration" },
+  { name: "approvals", description: "Upstream exec approvals workflow" },
+  { name: "nodes", description: "Upstream node commands" },
+  { name: "devices", description: "Upstream device pairing + token management" },
+  { name: "node", description: "Upstream node control" },
+  { name: "sandbox", description: "Upstream sandbox tooling" },
+  { name: "tui", description: "Upstream terminal UI" },
+  { name: "cron", description: "Upstream cron scheduler" },
+  { name: "dns", description: "Upstream DNS helpers" },
+  { name: "docs", description: "Upstream docs helpers" },
+  { name: "hooks", description: "Upstream hooks tooling" },
+  { name: "webhooks", description: "Upstream webhook helpers" },
+  { name: "pairing", description: "Upstream pairing helpers" },
+  { name: "plugins", description: "Upstream plugin management" },
+  { name: "directory", description: "Upstream directory commands" },
+  { name: "security", description: "Upstream security helpers" },
+  { name: "skills", description: "Upstream skills management" },
+  { name: "update", description: "Upstream CLI update helpers" },
+  { name: "completion", description: "Generate upstream shell completion script" },
+  { name: "autonomous", description: "Upstream autonomous browser agent" }
+];
+
+// src/cli/banner.ts
+import { execSync } from "child_process";
+
+// src/cli/ansi.ts
+var ANSI_SGR_PATTERN = /\u001b\[[0-9;]*m/g;
+var OSC8_PATTERN = /\u001b]8;;.*?(?:\u001b\\|\u0007)|\u001b]8;;(?:\u001b\\|\u0007)/g;
+function stripAnsi(input6) {
+  return input6.replace(OSC8_PATTERN, "").replace(ANSI_SGR_PATTERN, "");
+}
+function visibleWidth(input6) {
+  return Array.from(stripAnsi(input6)).length;
+}
+
+// src/cli/theme.ts
+import chalk20, { Chalk } from "chalk";
+var LOBSTER_PALETTE = {
+  accent: "#00d5ff",
+  accentBright: "#38bdf8",
+  accentDim: "#0ea5e9",
+  info: "#22d3ee",
+  success: "#2fbf71",
+  warn: "#ffb020",
+  error: "#e23d2d",
+  muted: "#64748b"
+};
+var hasForceColor = typeof process.env.FORCE_COLOR === "string" && process.env.FORCE_COLOR.trim().length > 0 && process.env.FORCE_COLOR.trim() !== "0";
+var hasNoColorArg = process.argv.includes("--no-color");
+var disableColor = (process.env.NO_COLOR || hasNoColorArg) && !hasForceColor;
+var baseChalk = disableColor ? new Chalk({ level: 0 }) : chalk20;
+var hex = (value) => baseChalk.hex(value);
+var theme = {
+  accent: hex(LOBSTER_PALETTE.accent),
+  accentBright: hex(LOBSTER_PALETTE.accentBright),
+  accentDim: hex(LOBSTER_PALETTE.accentDim),
+  info: hex(LOBSTER_PALETTE.info),
+  success: hex(LOBSTER_PALETTE.success),
+  warn: hex(LOBSTER_PALETTE.warn),
+  error: hex(LOBSTER_PALETTE.error),
+  muted: hex(LOBSTER_PALETTE.muted),
+  heading: baseChalk.bold.hex(LOBSTER_PALETTE.accent),
+  command: hex(LOBSTER_PALETTE.accentBright),
+  option: hex(LOBSTER_PALETTE.warn)
+};
+var isRich = () => Boolean(baseChalk.level > 0);
+
+// src/cli/tagline.ts
+var DEFAULT_TAGLINE = "All your chats, one AGDI.";
+var HOLIDAY_TAGLINES = {
+  newYear: "New Year: new configs, cleaner diffs, fewer port conflicts.",
+  christmas: "Christmas: ship joy, rollback safely, keep secrets out of logs.",
+  eid: "Eid: queues cleared, tasks done, good vibes merged to main.",
+  diwali: "Diwali: let logs sparkle and bugs fade away.",
+  easter: "Easter: found your missing env var in record time.",
+  hanukkah: "Hanukkah: eight nights, steady retries, stable gateway.",
+  halloween: "Halloween: haunted dependencies detected, caution advised.",
+  thanksgiving: "Thanksgiving: grateful for healthy ports and clean deploys.",
+  valentines: "Valentines: roses are typed, pipelines are green."
+};
+var TAGLINES = [
+  "Automation with claws: less toil, more shipping.",
+  "One CLI for chat ops, coding workflows, and controlled chaos.",
+  "Your terminal just got better at boring work.",
+  "From prompt to action without tab-sprawl.",
+  "Less clicking, more shipping.",
+  "Fast commands, clear logs, fewer regrets.",
+  "Write less glue code. Keep moving.",
+  "If it repeats, automate it.",
+  "Smarter defaults for real-world terminal work.",
+  "Build, run, and route messages from one place.",
+  "Your scripts, your infra, your control.",
+  "CLI-first workflows for teams that ship.",
+  "Secure-by-default habits, practical-by-default behavior.",
+  "Task in, outcome out.",
+  HOLIDAY_TAGLINES.newYear,
+  HOLIDAY_TAGLINES.christmas,
+  HOLIDAY_TAGLINES.eid,
+  HOLIDAY_TAGLINES.diwali,
+  HOLIDAY_TAGLINES.easter,
+  HOLIDAY_TAGLINES.hanukkah,
+  HOLIDAY_TAGLINES.halloween,
+  HOLIDAY_TAGLINES.thanksgiving,
+  HOLIDAY_TAGLINES.valentines
+];
+var DAY_MS = 24 * 60 * 60 * 1e3;
+function utcParts(date) {
+  return {
+    year: date.getUTCFullYear(),
+    month: date.getUTCMonth(),
+    day: date.getUTCDate()
+  };
+}
+var onMonthDay = (month, day) => (date) => {
+  const parts = utcParts(date);
+  return parts.month === month && parts.day === day;
+};
+var onSpecificDates = (dates, durationDays = 1) => (date) => {
+  const parts = utcParts(date);
+  return dates.some(([year, month, day]) => {
+    if (parts.year !== year) {
+      return false;
+    }
+    const start = Date.UTC(year, month, day);
+    const current = Date.UTC(parts.year, parts.month, parts.day);
+    return current >= start && current < start + durationDays * DAY_MS;
+  });
+};
+var inYearWindow = (windows) => (date) => {
+  const parts = utcParts(date);
+  const window = windows.find((entry) => entry.year === parts.year);
+  if (!window) {
+    return false;
+  }
+  const start = Date.UTC(window.year, window.month, window.day);
+  const current = Date.UTC(parts.year, parts.month, parts.day);
+  return current >= start && current < start + window.duration * DAY_MS;
+};
+var isFourthThursdayOfNovember = (date) => {
+  const parts = utcParts(date);
+  if (parts.month !== 10) {
+    return false;
+  }
+  const firstDay = new Date(Date.UTC(parts.year, 10, 1)).getUTCDay();
+  const offsetToThursday = (4 - firstDay + 7) % 7;
+  const fourthThursday = 1 + offsetToThursday + 21;
+  return parts.day === fourthThursday;
+};
+var HOLIDAY_RULES = /* @__PURE__ */ new Map([
+  [HOLIDAY_TAGLINES.newYear, onMonthDay(0, 1)],
+  [HOLIDAY_TAGLINES.christmas, onMonthDay(11, 25)],
+  [HOLIDAY_TAGLINES.valentines, onMonthDay(1, 14)],
+  [HOLIDAY_TAGLINES.halloween, onMonthDay(9, 31)],
+  [HOLIDAY_TAGLINES.thanksgiving, isFourthThursdayOfNovember],
+  [
+    HOLIDAY_TAGLINES.eid,
+    onSpecificDates(
+      [
+        [2025, 2, 30],
+        [2025, 2, 31],
+        [2026, 2, 20],
+        [2027, 2, 10]
+      ],
+      1
+    )
+  ],
+  [
+    HOLIDAY_TAGLINES.diwali,
+    onSpecificDates(
+      [
+        [2025, 9, 20],
+        [2026, 10, 8],
+        [2027, 9, 28]
+      ],
+      1
+    )
+  ],
+  [
+    HOLIDAY_TAGLINES.easter,
+    onSpecificDates(
+      [
+        [2025, 3, 20],
+        [2026, 3, 5],
+        [2027, 2, 28]
+      ],
+      1
+    )
+  ],
+  [
+    HOLIDAY_TAGLINES.hanukkah,
+    inYearWindow([
+      { year: 2025, month: 11, day: 15, duration: 8 },
+      { year: 2026, month: 11, day: 5, duration: 8 },
+      { year: 2027, month: 11, day: 25, duration: 8 }
+    ])
+  ]
+]);
+function isTaglineActive(tagline, date) {
+  const rule = HOLIDAY_RULES.get(tagline);
+  if (!rule) {
+    return true;
+  }
+  return rule(date);
+}
+function activeTaglines(options = {}) {
+  if (TAGLINES.length === 0) {
+    return [DEFAULT_TAGLINE];
+  }
+  const today = options.now ? options.now() : /* @__PURE__ */ new Date();
+  const filtered = TAGLINES.filter((tagline) => isTaglineActive(tagline, today));
+  return filtered.length > 0 ? filtered : TAGLINES;
+}
+function pickTagline(options = {}) {
+  const env = options.env ?? process.env;
+  const override = env?.AGDI_TAGLINE_INDEX;
+  if (override !== void 0) {
+    const parsed = Number.parseInt(override, 10);
+    if (!Number.isNaN(parsed) && parsed >= 0) {
+      const pool2 = TAGLINES.length > 0 ? TAGLINES : [DEFAULT_TAGLINE];
+      return pool2[parsed % pool2.length];
+    }
+  }
+  const pool = activeTaglines(options);
+  const rand = options.random ?? Math.random;
+  const index = Math.floor(rand() * pool.length) % pool.length;
+  return pool[index];
+}
+
+// src/cli/banner.ts
+var bannerEmitted = false;
+var cachedCommit;
+var hasJsonFlag = (argv) => argv.some((arg) => arg === "--json" || arg.startsWith("--json="));
+var hasVersionFlag = (argv) => argv.some((arg) => arg === "--version" || arg === "-V");
+function resolveCommitHash() {
+  if (cachedCommit !== void 0) {
+    return cachedCommit;
+  }
+  const envCommit = process.env.AGDI_COMMIT || process.env.VERCEL_GIT_COMMIT_SHA || process.env.GITHUB_SHA || process.env.npm_package_gitHead;
+  if (envCommit && envCommit.trim().length > 0) {
+    cachedCommit = envCommit.trim().slice(0, 8);
+    return cachedCommit;
+  }
+  try {
+    const out = execSync("git rev-parse --short HEAD", {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    }).trim();
+    cachedCommit = out.length > 0 ? out : null;
+    return cachedCommit;
+  } catch {
+    cachedCommit = null;
+    return cachedCommit;
+  }
+}
+function formatCliBannerLine(version, options = {}) {
+  const commit = options.commit ?? resolveCommitHash();
+  const commitLabel = commit ?? "unknown";
+  const tagline = pickTagline(options);
+  const rich = options.richTty ?? isRich();
+  const title = "AGDI";
+  const prefix = "* ";
+  const columns = options.columns ?? process.stdout.columns ?? 120;
+  const plainFullLine = `${title} ${version} (${commitLabel}) - ${tagline}`;
+  const fitsOnOneLine = visibleWidth(plainFullLine) <= columns;
+  if (rich) {
+    if (fitsOnOneLine) {
+      return `${theme.heading(title)} ${theme.info(version)} ${theme.muted(
+        `(${commitLabel})`
+      )} ${theme.muted("-")} ${theme.accentDim(tagline)}`;
+    }
+    const line12 = `${theme.heading(title)} ${theme.info(version)} ${theme.muted(`(${commitLabel})`)}`;
+    const line22 = `${" ".repeat(prefix.length)}${theme.accentDim(tagline)}`;
+    return `${line12}
+${line22}`;
+  }
+  if (fitsOnOneLine) {
+    return plainFullLine;
+  }
+  const line1 = `${title} ${version} (${commitLabel})`;
+  const line2 = `${" ".repeat(prefix.length)}${tagline}`;
+  return `${line1}
+${line2}`;
+}
+function emitCliBanner(version, options = {}) {
+  if (bannerEmitted) {
+    return;
+  }
+  const argv = options.argv ?? process.argv;
+  if (!process.stdout.isTTY) {
+    return;
+  }
+  if (hasJsonFlag(argv)) {
+    return;
+  }
+  if (hasVersionFlag(argv)) {
+    return;
+  }
+  const line = formatCliBannerLine(version, options);
+  process.stdout.write(`
+${line}
+
+`);
+  bannerEmitted = true;
+}
+function hasEmittedCliBanner() {
+  return bannerEmitted;
+}
+
+// src/cli/links.ts
+var DOCS_ROOT = "https://docs.agdi.ai";
+function formatTerminalLink(label, url, opts) {
+  const esc = "\x1B";
+  const safeLabel = label.replaceAll(esc, "");
+  const safeUrl = url.replaceAll(esc, "");
+  const allow = opts?.force === true ? true : opts?.force === false ? false : Boolean(process.stdout.isTTY);
+  if (!allow) {
+    return opts?.fallback ?? `${safeLabel} (${safeUrl})`;
+  }
+  return `\x1B]8;;${safeUrl}\x07${safeLabel}\x1B]8;;\x07`;
+}
+function formatDocsLink(path15, label) {
+  const trimmed = path15.trim();
+  const url = trimmed.startsWith("http") ? trimmed : `${DOCS_ROOT}${trimmed.startsWith("/") ? trimmed : `/${trimmed}`}`;
+  return formatTerminalLink(label ?? url, url, { fallback: url });
+}
+
+// src/cli/help.ts
+var EXAMPLES = [
+  ["agdi wizard", "Run the interactive setup flow."],
+  ['agdi build "crm dashboard" --output ./my-app', "Generate an app from a prompt."],
+  ['agdi squad "build a booking app" --deploy', "Run autonomous multi-agent delivery."],
+  ["agdi channels list", "List synced channel runtimes and status."],
+  [
+    'agdi channels send --channel telegram --message "Hi" --to @team-room',
+    "Send outbound message via a channel runtime."
+  ]
+];
+function hasVersionFlag2(argv) {
+  return argv.some((arg) => arg === "-V" || arg === "--version");
+}
+function configureCliDesign(program2, programVersion) {
+  program2.configureHelp({
+    sortSubcommands: true,
+    sortOptions: true,
+    optionTerm: (option) => theme.option(option.flags),
+    subcommandTerm: (cmd) => theme.command(cmd.name())
+  });
+  program2.configureOutput({
+    writeOut: (str) => {
+      const colored = str.replace(/^Usage:/gm, theme.heading("Usage:")).replace(/^Options:/gm, theme.heading("Options:")).replace(/^Commands:/gm, theme.heading("Commands:"));
+      process.stdout.write(colored);
+    },
+    writeErr: (str) => process.stderr.write(str),
+    outputError: (str, write) => write(theme.error(str))
+  });
+  if (hasVersionFlag2(process.argv)) {
+    console.log(programVersion);
+    process.exit(0);
+  }
+  program2.addHelpText("beforeAll", () => {
+    if (hasEmittedCliBanner()) {
+      return "";
+    }
+    const line = formatCliBannerLine(programVersion, { richTty: isRich() });
+    return `
+${line}
+`;
+  });
+  const formattedExamples = EXAMPLES.map(
+    ([command, description]) => `  ${theme.command(command)}
+    ${theme.muted(description)}`
+  ).join("\n");
+  program2.addHelpText("afterAll", ({ command }) => {
+    if (command !== program2) {
+      return "";
+    }
+    const docs = formatDocsLink("/cli", "docs.agdi.ai/cli");
+    return `
+${theme.heading("Examples:")}
+${formattedExamples}
+
+${theme.muted("Docs:")} ${docs}
 `;
+  });
+}
+
+// src/index.ts
+var PROGRAM_VERSION = "3.3.8";
 var program = new Command();
-program.name("agdi").description(chalk18.cyan("\u{1F9B8} The Autonomous AI Employee")).version("3.3.7").option("-y, --yes", "Auto-approve all prompts (headless/CI mode)").option("-m, --minimal", "Generate only the requested file(s), not a full app").option("-d, --dry-run", "Show what would be created without writing files").option("--saas", "Generate a production SaaS blueprint (Next.js + Prisma + Postgres + Stripe)");
+program.name("agdi").description("").version(PROGRAM_VERSION).option("-y, --yes", "Auto-approve all prompts (headless/CI mode)").option("-m, --minimal", "Generate only the requested file(s), not a full app").option("-d, --dry-run", "Show what would be created without writing files").option("--saas", "Generate a production SaaS blueprint (Next.js + Prisma + Postgres + Stripe)").option("--no-color", "Disable ANSI colors", false);
+configureCliDesign(program, PROGRAM_VERSION);
 program.hook("preAction", (thisCommand) => {
+  emitCliBanner(PROGRAM_VERSION, { argv: process.argv });
   const opts = thisCommand.opts();
   if (opts.yes) {
     ui.setFlags({ yes: true, headless: true });
@@ -6489,20 +7178,12 @@ program.hook("preAction", (thisCommand) => {
     ui.setFlags({ saas: true });
   }
 });
-program.addHelpText("beforeAll", () => {
-  return BANNER + "\n" + chalk18.gray("  The Autonomous AI Employee") + "\n" + chalk18.gray("  \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\n");
-});
-program.addHelpText("afterAll", () => {
-  return "\n" + chalk18.gray("Links:") + `
-  ${chalk18.cyan("Discord:")} https://discord.gg/pPkZ93Yb
-`;
-});
 program.action(async () => {
   try {
     await runWizard();
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk18.gray("\n\n\u{1F44B} Goodbye!\n"));
+      console.log(chalk21.gray("\n\n\u{1F44B} Goodbye!\n"));
       try {
         ui.safeExit(0);
       } catch {
@@ -6524,7 +7205,7 @@ program.command("auth").description("Configure API keys").option("--status", "Sh
     }
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk18.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk21.gray("\n\n\u{1F44B} Cancelled.\n"));
       try {
         ui.safeExit(0);
       } catch {
@@ -6542,7 +7223,7 @@ program.command("model").alias("models").description("Change AI model").action(a
     await selectModel();
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk18.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk21.gray("\n\n\u{1F44B} Cancelled.\n"));
       try {
         ui.safeExit(0);
       } catch {
@@ -6563,7 +7244,7 @@ program.command("chat").description("Start a chat session").action(async () => {
     await startChat();
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk18.gray("\n\n\u{1F44B} Goodbye!\n"));
+      console.log(chalk21.gray("\n\n\u{1F44B} Goodbye!\n"));
       try {
         ui.safeExit(0);
       } catch {
@@ -6581,7 +7262,7 @@ program.command("run [directory]").description("Run a generated project").action
     await runProject(directory);
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk18.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk21.gray("\n\n\u{1F44B} Cancelled.\n"));
       try {
         ui.safeExit(0);
       } catch {
@@ -6604,7 +7285,7 @@ program.command("build <prompt>").alias("b").description("Generate an app from a
     }
     const activeConfig = getActiveProvider();
     if (!activeConfig) {
-      console.log(chalk18.red("\u274C No API key configured. Run: agdi auth"));
+      console.log(chalk21.red("\u274C No API key configured. Run: agdi auth"));
       return;
     }
     const spinner = ora7("Generating application...").start();
@@ -6616,52 +7297,52 @@ program.command("build <prompt>").alias("b").description("Generate an app from a
       const pm = new ProjectManager();
       pm.create(options.output.replace("./", ""), prompt);
       const { plan, files } = await generateApp(prompt, llm, (step, file) => {
-        spinner.text = file ? `${step} ${chalk18.gray(file)}` : step;
+        spinner.text = file ? `${step} ${chalk21.gray(file)}` : step;
       });
       pm.updateFiles(files);
       pm.updateDependencies(plan.dependencies);
       if (options.dryRun || ui.flags.dryRun) {
         spinner.stop();
-        console.log(chalk18.cyan.bold("\n\u{1F6A7} DRY RUN SUMMARY\n"));
-        console.log(chalk18.gray(`Project: ${plan.name}
+        console.log(chalk21.cyan.bold("\n\u{1F6A7} DRY RUN SUMMARY\n"));
+        console.log(chalk21.gray(`Project: ${plan.name}
 `));
-        console.log(chalk18.cyan("Files to be created:"));
-        files.forEach((f) => console.log(chalk18.gray(`  \u{1F4C4} ${f.path}`)));
-        console.log(chalk18.cyan("\nDependencies:"));
-        console.log(chalk18.gray(`  \u{1F4E6} ${plan.dependencies.join(", ")}`));
-        console.log(chalk18.green("\n\u2713 Dry run complete. No files written.\n"));
+        console.log(chalk21.cyan("Files to be created:"));
+        files.forEach((f) => console.log(chalk21.gray(`  \u{1F4C4} ${f.path}`)));
+        console.log(chalk21.cyan("\nDependencies:"));
+        console.log(chalk21.gray(`  \u{1F4E6} ${plan.dependencies.join(", ")}`));
+        console.log(chalk21.green("\n\u2713 Dry run complete. No files written.\n"));
         return;
       }
       await writeProject(pm.get(), options.output);
-      spinner.succeed(chalk18.green("App generated!"));
-      console.log(chalk18.gray(`
-\u{1F4C1} Created ${files.length} files in ${chalk18.cyan(options.output)}`));
+      spinner.succeed(chalk21.green("App generated!"));
+      console.log(chalk21.gray(`
+\u{1F4C1} Created ${files.length} files in ${chalk21.cyan(options.output)}`));
       if (ui.flags.saas || options.saas) {
-        console.log(chalk18.cyan("\nSaaS Quick Start:"));
-        console.log(chalk18.gray(`  1) cd ${options.output}`));
-        console.log(chalk18.gray("  2) npm install"));
-        console.log(chalk18.gray("  3) cp .env.example .env"));
-        console.log(chalk18.gray("  4) npx prisma generate"));
-        console.log(chalk18.gray("  5) npx prisma db push"));
-        console.log(chalk18.gray("  6) npm run dev\n"));
+        console.log(chalk21.cyan("\nSaaS Quick Start:"));
+        console.log(chalk21.gray(`  1) cd ${options.output}`));
+        console.log(chalk21.gray("  2) npm install"));
+        console.log(chalk21.gray("  3) cp .env.example .env"));
+        console.log(chalk21.gray("  4) npx prisma generate"));
+        console.log(chalk21.gray("  5) npx prisma db push"));
+        console.log(chalk21.gray("  6) npm run dev\n"));
       } else {
-        console.log(chalk18.gray("\nNext: cd " + options.output + " && npm install && npm run dev\n"));
+        console.log(chalk21.gray("\nNext: cd " + options.output + " && npm install && npm run dev\n"));
       }
     } catch (error) {
       spinner.fail("Generation failed");
       const msg = error instanceof Error ? error.message : String(error);
       if (msg.includes("429") || msg.includes("quota")) {
-        console.log(chalk18.yellow("\n\u26A0\uFE0F  Quota exceeded. Run: agdi model\n"));
+        console.log(chalk21.yellow("\n\u26A0\uFE0F  Quota exceeded. Run: agdi model\n"));
       } else if (msg.includes("401") || msg.includes("403")) {
-        console.log(chalk18.red("\n\u{1F511} Invalid API key. Run: agdi auth\n"));
+        console.log(chalk21.red("\n\u{1F511} Invalid API key. Run: agdi auth\n"));
       } else {
-        console.error(chalk18.red("\n" + msg + "\n"));
+        console.error(chalk21.red("\n" + msg + "\n"));
       }
       ui.safeExit(1);
     }
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk18.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk21.gray("\n\n\u{1F44B} Cancelled.\n"));
       try {
         ui.safeExit(0);
       } catch {
@@ -6677,11 +7358,11 @@ program.command("build <prompt>").alias("b").description("Generate an app from a
 program.command("config").description("Show configuration").action(async () => {
   const config = loadConfig();
   const active = getActiveProvider();
-  console.log(chalk18.cyan.bold("\n\u2699\uFE0F  Configuration\n"));
-  console.log(chalk18.gray("  Provider: ") + chalk18.cyan(config.defaultProvider || "not set"));
-  console.log(chalk18.gray("  Model:    ") + chalk18.cyan(config.defaultModel || "not set"));
-  console.log(chalk18.gray("  Config:   ") + chalk18.gray("~/.agdi/config.json"));
-  console.log(chalk18.cyan.bold("\n\u{1F510} API Keys\n"));
+  console.log(chalk21.cyan.bold("\n\u2699\uFE0F  Configuration\n"));
+  console.log(chalk21.gray("  Provider: ") + chalk21.cyan(config.defaultProvider || "not set"));
+  console.log(chalk21.gray("  Model:    ") + chalk21.cyan(config.defaultModel || "not set"));
+  console.log(chalk21.gray("  Config:   ") + chalk21.gray("~/.agdi/config.json"));
+  console.log(chalk21.cyan.bold("\n\u{1F510} API Keys\n"));
   const keys = [
     ["Gemini", config.geminiApiKey],
     ["OpenRouter", config.openrouterApiKey],
@@ -6690,13 +7371,13 @@ program.command("config").description("Show configuration").action(async () => {
     ["DeepSeek", config.deepseekApiKey]
   ];
   for (const [name, key] of keys) {
-    const status = key ? chalk18.green("\u2713") : chalk18.gray("\u2717");
+    const status = key ? chalk21.green("\u2713") : chalk21.gray("\u2717");
     console.log(`  ${status} ${name}`);
   }
-  console.log(chalk18.cyan.bold("\n\u{1F4CA} Telemetry\n"));
+  console.log(chalk21.cyan.bold("\n\u{1F4CA} Telemetry\n"));
   const telemetryEnabled = config.telemetry?.enabled ?? false;
-  console.log(`  ${telemetryEnabled ? chalk18.green("\u2713 Enabled") : chalk18.gray("\u2717 Disabled")}`);
-  console.log(chalk18.gray("  Change with: agdi config telemetry --enable | --disable"));
+  console.log(`  ${telemetryEnabled ? chalk21.green("\u2713 Enabled") : chalk21.gray("\u2717 Disabled")}`);
+  console.log(chalk21.gray("  Change with: agdi config telemetry --enable | --disable"));
   console.log("");
   console.log("");
 });
@@ -6704,68 +7385,68 @@ program.command("config:telemetry").alias("telemetry").description("Manage telem
   const { isTelemetryEnabled, setTelemetryConsent, getTelemetryConfig } = await import("./config-K2XM6D4Z.js");
   const { generateSampleEvent, generateSanitizationDemo } = await import("./telemetry-service-76YPOPDM.js");
   if (options.dryRun || options.test) {
-    console.log(chalk18.cyan.bold("\n\u{1F50D} TELEMETRY TRANSPARENCY MODE\n"));
-    console.log(chalk18.gray("This is exactly what Agdi sends. Notice there is"));
-    console.log(chalk18.green.bold("NO source code, file paths, or API keys.\n"));
-    console.log(chalk18.white.bold('\u{1F4CA} Sample "Build Failed" Event:\n'));
+    console.log(chalk21.cyan.bold("\n\u{1F50D} TELEMETRY TRANSPARENCY MODE\n"));
+    console.log(chalk21.gray("This is exactly what Agdi sends. Notice there is"));
+    console.log(chalk21.green.bold("NO source code, file paths, or API keys.\n"));
+    console.log(chalk21.white.bold('\u{1F4CA} Sample "Build Failed" Event:\n'));
     const sample = generateSampleEvent();
-    console.log(chalk18.gray(JSON.stringify(sample, null, 2)));
-    console.log(chalk18.white.bold("\n\u{1F6E1}\uFE0F  Sanitization Demo:\n"));
-    console.log(chalk18.gray("Even if sensitive data accidentally enters an error message,"));
-    console.log(chalk18.gray("our sanitization layer strips it before transmission:\n"));
+    console.log(chalk21.gray(JSON.stringify(sample, null, 2)));
+    console.log(chalk21.white.bold("\n\u{1F6E1}\uFE0F  Sanitization Demo:\n"));
+    console.log(chalk21.gray("Even if sensitive data accidentally enters an error message,"));
+    console.log(chalk21.gray("our sanitization layer strips it before transmission:\n"));
     const demo = generateSanitizationDemo();
-    console.log(chalk18.red.bold("BEFORE sanitization (never sent):"));
-    console.log(chalk18.gray(JSON.stringify({
+    console.log(chalk21.red.bold("BEFORE sanitization (never sent):"));
+    console.log(chalk21.gray(JSON.stringify({
       errorCode: demo.before.errorCode,
       feedback: demo.before.feedback
     }, null, 2)));
-    console.log(chalk18.green.bold("\nAFTER sanitization (what we actually send):"));
-    console.log(chalk18.gray(JSON.stringify({
+    console.log(chalk21.green.bold("\nAFTER sanitization (what we actually send):"));
+    console.log(chalk21.gray(JSON.stringify({
       errorCode: demo.after.errorCode,
       feedback: demo.after.feedback
     }, null, 2)));
-    console.log(chalk18.cyan("\n\u2705 Your code and secrets are NEVER transmitted."));
-    console.log(chalk18.gray("   Learn more: https://agdi-dev.vercel.app/privacy\n"));
+    console.log(chalk21.cyan("\n\u2705 Your code and secrets are NEVER transmitted."));
+    console.log(chalk21.gray("   Learn more: https://agdi-dev.vercel.app/privacy\n"));
     return;
   }
   if (options.enable) {
     setTelemetryConsent(true);
-    console.log(chalk18.green("\n\u2705 Telemetry enabled"));
-    console.log(chalk18.gray("   We collect: success/fail, error types, model used"));
-    console.log(chalk18.gray("   We NEVER collect: source code, API keys, file paths"));
-    console.log(chalk18.gray("   Verify anytime: agdi config telemetry --dry-run\n"));
+    console.log(chalk21.green("\n\u2705 Telemetry enabled"));
+    console.log(chalk21.gray("   We collect: success/fail, error types, model used"));
+    console.log(chalk21.gray("   We NEVER collect: source code, API keys, file paths"));
+    console.log(chalk21.gray("   Verify anytime: agdi config telemetry --dry-run\n"));
   } else if (options.disable) {
     setTelemetryConsent(false);
-    console.log(chalk18.yellow("\n\u{1F4CA} Telemetry disabled"));
-    console.log(chalk18.gray("   You can re-enable anytime with: agdi config telemetry --enable\n"));
+    console.log(chalk21.yellow("\n\u{1F4CA} Telemetry disabled"));
+    console.log(chalk21.gray("   You can re-enable anytime with: agdi config telemetry --enable\n"));
   } else {
     const config = getTelemetryConfig();
-    console.log(chalk18.cyan.bold("\n\u{1F4CA} Telemetry Status\n"));
-    console.log(chalk18.gray("  Enabled:  ") + (config.enabled ? chalk18.green("Yes") : chalk18.gray("No")));
-    console.log(chalk18.gray("  Consent:  ") + (config.consentAsked ? chalk18.green("Asked") : chalk18.gray("Not asked")));
+    console.log(chalk21.cyan.bold("\n\u{1F4CA} Telemetry Status\n"));
+    console.log(chalk21.gray("  Enabled:  ") + (config.enabled ? chalk21.green("Yes") : chalk21.gray("No")));
+    console.log(chalk21.gray("  Consent:  ") + (config.consentAsked ? chalk21.green("Asked") : chalk21.gray("Not asked")));
     if (config.anonymousId) {
-      console.log(chalk18.gray("  ID:       ") + chalk18.gray(config.anonymousId.slice(0, 8) + "..."));
+      console.log(chalk21.gray("  ID:       ") + chalk21.gray(config.anonymousId.slice(0, 8) + "..."));
     }
     console.log("");
-    console.log(chalk18.gray("  Enable:   agdi config telemetry --enable"));
-    console.log(chalk18.gray("  Disable:  agdi config telemetry --disable"));
-    console.log(chalk18.gray("  Verify:   agdi config telemetry --dry-run\n"));
+    console.log(chalk21.gray("  Enable:   agdi config telemetry --enable"));
+    console.log(chalk21.gray("  Disable:  agdi config telemetry --disable"));
+    console.log(chalk21.gray("  Verify:   agdi config telemetry --dry-run\n"));
   }
 });
 program.command("doctor").alias("doc").description("Run self-diagnosis checks").action(async () => {
   try {
     await runDoctor();
   } catch (error) {
-    console.error(chalk18.red("Diagnostic failed: " + error));
+    console.error(chalk21.red("Diagnostic failed: " + error));
     ui.safeExit(1);
   }
 });
-program.command("features").description("List or sync upstream Agdi feature packs into this repo").option("--sync", "Copy feature packs from Agdi into ./upstream/agdi").option("--from <path>", "Path to Agdi source repo (default: ../Agdi)").option("--to <path>", "Destination path (default: ./upstream/agdi)").action(async (options) => {
+program.command("features").description("List or sync upstream Agdi feature packs into this repo").option("--sync", "Copy feature packs from Agdi into ./upstream/agdi").option("--all", "Mirror full upstream Agdi runtime/features into ./upstream/agdi").option("--from <path>", "Path to Agdi source repo (default: ../Agdi)").option("--to <path>", "Destination path (default: ./upstream/agdi)").action(async (options) => {
   try {
     await runFeaturesCommand(options);
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk18.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk21.gray("\n\n\u{1F44B} Cancelled.\n"));
       try {
         ui.safeExit(0);
       } catch {
@@ -6784,7 +7465,7 @@ channelsCommand.command("list").description("List discovered channel extensions
     await runChannelsListCommand();
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk18.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk21.gray("\n\n\u{1F44B} Cancelled.\n"));
       try {
         ui.safeExit(0);
       } catch {
@@ -6802,7 +7483,7 @@ channelsCommand.command("send").description("Send a message through a supported
     await runChannelsSendCommand(options);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    console.log(chalk18.red(`
+    console.log(chalk21.red(`
 ${message}
 `));
     try {
@@ -6816,7 +7497,7 @@ channelsCommand.command("doctor").description("Validate tokens/webhooks/session
     await runChannelsDoctorCommand();
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    console.log(chalk18.red(`
+    console.log(chalk21.red(`
 ${message}
 `));
     try {
@@ -6825,6 +7506,36 @@ ${message}
     }
   }
 });
+var gatewayCommand = program.command("gateway").description("Native gateway control for Agdi-dev");
+gatewayCommand.command("status").description("Check gateway reachability and health endpoint").option("--host <host>", "Gateway host (default: 127.0.0.1)").option("--port <port>", "Gateway port (default: 18789)").action(async (options) => {
+  await runGatewayStatusCommand(options);
+});
+gatewayCommand.command("health").description("Fetch /health from the gateway endpoint").option("--host <host>", "Gateway host (default: 127.0.0.1)").option("--port <port>", "Gateway port (default: 18789)").action(async (options) => {
+  await runGatewayHealthCommand(options);
+});
+function registerUpstreamProxyCommand(spec) {
+  const existingNames = /* @__PURE__ */ new Set();
+  for (const cmd of program.commands) {
+    existingNames.add(cmd.name());
+    const aliases = cmd._aliases ?? [];
+    for (const alias of aliases) {
+      existingNames.add(alias);
+    }
+  }
+  const requestedNames = [spec.name, ...spec.aliases ?? []];
+  if (requestedNames.some((name) => existingNames.has(name))) {
+    return;
+  }
+  const command = program.command(`${spec.name} [args...]`).description(`${spec.description} ${chalk21.gray("(proxied to upstream Agdi)")}`).helpOption(false).allowUnknownOption(true).allowExcessArguments(true).action(async () => {
+    await runUpstreamProxy(spec);
+  });
+  for (const alias of spec.aliases ?? []) {
+    command.alias(alias);
+  }
+}
+for (const spec of UPSTREAM_PROXY_COMMANDS) {
+  registerUpstreamProxyCommand(spec);
+}
 program.command("squad [prompt]").alias("s").description("\u{1F9B8} Autonomous multi-agent app builder").option("-d, --deploy", "Auto-deploy to Vercel after build").option("-o, --output <dir>", "Output directory", "./").option("-v, --verbose", "Show detailed agent logs", true).action(async (prompt, options) => {
   try {
     if (needsOnboarding()) {
@@ -6832,7 +7543,7 @@ program.command("squad [prompt]").alias("s").description("\u{1F9B8} Autonomous m
     }
     const activeConfig = getActiveProvider();
     if (!activeConfig) {
-      console.log(chalk18.red("\u274C No API key configured. Run: agdi auth"));
+      console.log(chalk21.red("\u274C No API key configured. Run: agdi auth"));
       return;
     }
     const llm = createLLMProvider(activeConfig.provider, {
@@ -6846,7 +7557,7 @@ program.command("squad [prompt]").alias("s").description("\u{1F9B8} Autonomous m
     });
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk18.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk21.gray("\n\n\u{1F44B} Cancelled.\n"));
       try {
         ui.safeExit(0);
       } catch {
@@ -6874,7 +7585,7 @@ program.command("replay <runId>").description("\u{1F501} Replay a previous squad
     }
     const activeConfig = getActiveProvider();
     if (!activeConfig) {
-      console.log(chalk18.red("\u274C No API key configured. Run: agdi auth"));
+      console.log(chalk21.red("\u274C No API key configured. Run: agdi auth"));
       return;
     }
     const llm = createLLMProvider(activeConfig.provider, {
@@ -6888,7 +7599,7 @@ program.command("replay <runId>").description("\u{1F501} Replay a previous squad
     });
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk18.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk21.gray("\n\n\u{1F44B} Cancelled.\n"));
       try {
         ui.safeExit(0);
       } catch {
@@ -6906,7 +7617,7 @@ program.command("import <url>").alias("i").description("\u{1F4E6} Import a GitHu
     await runImportCommand(url, options.output);
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk18.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk21.gray("\n\n\u{1F44B} Cancelled.\n"));
       try {
         ui.safeExit(0);
       } catch {
@@ -6920,7 +7631,7 @@ program.command("wizard").alias("w").description("\u{1F9D9} Start the ClawBot Se
   try {
     await runWizard();
   } catch (error) {
-    console.log(chalk18.gray("\n\n\u{1F44B} Cancelled.\n"));
+    console.log(chalk21.gray("\n\n\u{1F44B} Cancelled.\n"));
     try {
       ui.safeExit(0);
     } catch {