merge: merge composable-cli to composable-cli-e2

Author: hopelynd

.gitignore

@@ -12,6 +12,7 @@ node_modules
 dist
 dist-ssr
 tools/generated
+.node-version
 
 *.local
 

packages/cli/package.json

@@ -33,6 +33,10 @@
     "./package.json": "./package.json"
   },
   "publishConfig": {
+    "exports": {
+      ".": "./dist/bailian.mjs",
+      "./package.json": "./package.json"
+    },
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {

packages/cli/src/commands.ts

@@ -0,0 +1,101 @@
+import type { Command } from "bailian-cli-core";
+import {
+  authLogin,
+  authStatus,
+  authLogout,
+  textChat,
+  textOmni,
+  imageGenerate,
+  imageEdit,
+  videoGenerate,
+  videoEdit,
+  videoRef,
+  videoTaskGet,
+  videoDownload,
+  visionDescribe,
+  configShow,
+  configSet,
+  update,
+  appCall,
+  appList,
+  memoryAdd,
+  memorySearch,
+  memoryList,
+  memoryUpdate,
+  memoryDelete,
+  memoryProfileCreate,
+  memoryProfileGet,
+  knowledgeRetrieve,
+  mcpCall,
+  mcpList,
+  mcpTools,
+  searchWeb,
+  speechSynthesize,
+  speechRecognize,
+  fileUpload,
+  consoleCall,
+  usageFree,
+  usageFreetier,
+  usageStats,
+  pipelineRun,
+  pipelineValidate,
+  advisorRecommend,
+  workspaceList,
+  quotaList,
+  quotaRequest,
+  quotaHistory,
+  quotaCheck,
+} from "bailian-cli-commands";
+
+// Full bailian-cli product: every command, exposed under the `bl` binary.
+// The command paths below are this product's decision — the command library
+// ships no presets, so the map is spelled out here. Kept in its own module
+// (no side effects) so tools like generate-reference.ts can import it without
+// starting the CLI.
+export const commands: Record<string, Command> = {
+  "auth login": authLogin,
+  "auth status": authStatus,
+  "auth logout": authLogout,
+  "text chat": textChat,
+  omni: textOmni,
+  "image generate": imageGenerate,
+  "image edit": imageEdit,
+  "video generate": videoGenerate,
+  "video edit": videoEdit,
+  "video ref": videoRef,
+  "video task get": videoTaskGet,
+  "video download": videoDownload,
+  "vision describe": visionDescribe,
+  "config show": configShow,
+  "config set": configSet,
+  update,
+  "app call": appCall,
+  "app list": appList,
+  "memory add": memoryAdd,
+  "memory search": memorySearch,
+  "memory list": memoryList,
+  "memory update": memoryUpdate,
+  "memory delete": memoryDelete,
+  "memory profile create": memoryProfileCreate,
+  "memory profile get": memoryProfileGet,
+  "knowledge retrieve": knowledgeRetrieve,
+  "mcp call": mcpCall,
+  "mcp list": mcpList,
+  "mcp tools": mcpTools,
+  "search web": searchWeb,
+  "speech synthesize": speechSynthesize,
+  "speech recognize": speechRecognize,
+  "file upload": fileUpload,
+  "console call": consoleCall,
+  "usage free": usageFree,
+  "usage freetier": usageFreetier,
+  "usage stats": usageStats,
+  "pipeline run": pipelineRun,
+  "pipeline validate": pipelineValidate,
+  "advisor recommend": advisorRecommend,
+  "workspace list": workspaceList,
+  "quota list": quotaList,
+  "quota request": quotaRequest,
+  "quota history": quotaHistory,
+  "quota check": quotaCheck,
+};

packages/cli/src/main.ts

@@ -1,8 +1,7 @@
 import { createCli } from "bailian-cli-runtime";
-import { commands } from "bailian-cli-commands";
+import { commands } from "./commands.ts";
 import pkg from "../package.json" with { type: "json" };
 
-// Full bailian-cli product: every command, exposed under the `bl` binary.
 createCli(commands, {
   binName: "bl",
   version: pkg.version,

packages/cli/tsconfig.json

@@ -5,6 +5,7 @@
     "moduleDetection": "force",
     "module": "nodenext",
     "moduleResolution": "nodenext",
+    "customConditions": ["@bailian-cli/source"],
     "resolveJsonModule": true,
     "types": ["node"],
     "strict": true,

packages/commands/package.json

@@ -19,8 +19,10 @@
   "type": "module",
   "types": "./dist/index.d.mts",
   "exports": {
-    ".": "./dist/index.mjs",
-    "./e2e": "./tests/e2e/core/index.ts",
+    ".": {
+      "@bailian-cli/source": "./src/index.ts",
+      "default": "./dist/index.mjs"
+    },
     "./package.json": "./package.json"
   },
   "publishConfig": {

packages/commands/src/commands/advisor/recommend.ts

@@ -19,7 +19,7 @@ import boxen from "boxen";
 import chalk, { Chalk, type ChalkInstance } from "chalk";
 import { emitBare, emitResult } from "bailian-cli-runtime";
 import { createSpinner } from "bailian-cli-runtime";
-import { failIfMissing, promptText } from "bailian-cli-runtime";
+import { failIfMissing, promptText, cmdUsage } from "bailian-cli-runtime";
 
 function formatContextWindow(tokens: number): string {
   if (tokens >= 1_000_000)
@@ -215,10 +215,9 @@ function isEmptyResult(result: RecommendResult): boolean {
 }
 
 export default defineCommand({
-  name: "advisor recommend",
   description:
     "Recommend the best models for your use case (intent analysis → candidate recall → LLM ranking)",
-  usage: "bl advisor recommend <prompt> [flags]",
+  usageArgs: "<prompt> [flags]",
   options: [
     {
       flag: "--message <text>",
@@ -233,13 +232,13 @@ export default defineCommand({
       description: "Output format: text (default in TTY), json, yaml",
     },
   ],
-  examples: [
-    'bl advisor recommend --message "I need a visual-understanding chatbot"',
-    'bl advisor recommend --message "Build an Agent that auto-generates animations"',
-    'bl advisor recommend --message "Legal contract review, high precision required"',
-    'bl advisor recommend --message "Low-cost high-concurrency online customer service" --output json',
-    'bl advisor recommend --message "Long document summarization" --dry-run',
-    "bl advisor recommend                                          # Interactive input",
+  exampleArgs: [
+    '--message "I need a visual-understanding chatbot"',
+    '--message "Build an Agent that auto-generates animations"',
+    '--message "Legal contract review, high precision required"',
+    '--message "Low-cost high-concurrency online customer service" --output json',
+    '--message "Long document summarization" --dry-run',
+    "                                          # Interactive input",
   ],
   async run(config: Config, flags: GlobalFlags) {
     const positional = ((flags as Record<string, unknown>)._positional as string[]) ?? [];
@@ -254,7 +253,7 @@ export default defineCommand({
         }
         userInput = hint;
       } else {
-        failIfMissing("message", 'bl advisor recommend "your requirement"');
+        failIfMissing("message", cmdUsage(config, '"your requirement"'));
       }
     }
 

packages/commands/src/commands/app/call.ts

@@ -11,13 +11,12 @@ import {
   type AppStreamChunk,
   type AppCompletionResponse,
 } from "bailian-cli-core";
-import { failIfMissing } from "bailian-cli-runtime";
+import { failIfMissing, cmdUsage } from "bailian-cli-runtime";
 import { emitResult, emitBare } from "bailian-cli-runtime";
 
 export default defineCommand({
-  name: "app call",
   description: "Call a Bailian application (agent or workflow)",
-  usage: "bl app call --app-id <id> --prompt <text> [flags]",
+  usageArgs: "--app-id <id> --prompt <text> [flags]",
   options: [
     { flag: "--app-id <id>", description: "Application ID (required)", required: true },
     { flag: "--prompt <text>", description: "Input prompt text", required: true },
@@ -34,20 +33,20 @@ export default defineCommand({
     { flag: "--biz-params <json>", description: "Business parameters JSON (workflow variables)" },
     { flag: "--has-thoughts", description: "Show agent thinking process" },
   ],
-  examples: [
-    'bl app call --app-id abc123 --prompt "Hello"',
-    'bl app call --app-id abc123 --prompt "Describe this image" --image https://example.com/photo.jpg',
-    'bl app call --app-id abc123 --prompt "Analyze the image" --image img1.jpg --image img2.jpg',
-    'bl app call --app-id abc123 --prompt "Continue" --session-id sess_xxx --stream',
-    'bl app call --app-id abc123 --prompt "Search for materials" --pipeline-ids pipe1,pipe2',
-    'bl app call --app-id abc123 --prompt "Start" --biz-params \'{"key":"value"}\'',
+  exampleArgs: [
+    '--app-id abc123 --prompt "Hello"',
+    '--app-id abc123 --prompt "Describe this image" --image https://example.com/photo.jpg',
+    '--app-id abc123 --prompt "Analyze the image" --image img1.jpg --image img2.jpg',
+    '--app-id abc123 --prompt "Continue" --session-id sess_xxx --stream',
+    '--app-id abc123 --prompt "Search for materials" --pipeline-ids pipe1,pipe2',
+    '--app-id abc123 --prompt "Start" --biz-params \'{"key":"value"}\'',
   ],
   async run(config: Config, flags: GlobalFlags) {
     const appId = flags.appId as string;
-    if (!appId) failIfMissing("app-id", "bl app call --app-id <id> --prompt <text>");
+    if (!appId) failIfMissing("app-id", cmdUsage(config, "--app-id <id> --prompt <text>"));
 
     const prompt = flags.prompt as string;
-    if (!prompt) failIfMissing("prompt", "bl app call --app-id <id> --prompt <text>");
+    if (!prompt) failIfMissing("prompt", cmdUsage(config, "--app-id <id> --prompt <text>"));
 
     const shouldStream =
       flags.stream === true || (flags.stream === undefined && process.stdout.isTTY);

packages/commands/src/commands/app/list.ts

@@ -11,10 +11,9 @@ import { emitResult } from "bailian-cli-runtime";
 const APP_LIST_API = "zeldaEasy.broadscope-bailian.app-control.list";
 
 export default defineCommand({
-  name: "app list",
   description: "List Bailian applications",
   skipDefaultApiKeySetup: true,
-  usage: "bl app list [flags]",
+  usageArgs: "[flags]",
   options: [
     {
       flag: "--name <name>",
@@ -41,12 +40,7 @@ export default defineCommand({
       type: "number",
     },
   ],
-  examples: [
-    "bl app list",
-    "bl app list --name customer service",
-    "bl app list --page 2 --page-size 10",
-    "bl app list --output json",
-  ],
+  exampleArgs: ["", "--name customer service", "--page 2 --page-size 10", "--output json"],
   async run(config: Config, flags: GlobalFlags) {
     const name = (flags.name as string) || "";
     const pageNo = (flags.page as number) || 1;

packages/commands/src/commands/auth/login.ts

@@ -18,10 +18,9 @@ import {
 } from "./login-console.ts";
 
 export default defineCommand({
-  name: "auth login",
   description: "Authenticate with API key or console browser login (credentials can coexist)",
   skipDefaultApiKeySetup: true,
-  usage: "bl auth login --api-key <key> | bl auth login --console",
+  usageArgs: "--api-key <key> | --console",
   options: [
     { flag: "--api-key <key>", description: "DashScope API key to store" },
     {
@@ -34,7 +33,7 @@ export default defineCommand({
         "Sign in via browser; use --console-site to choose domestic (default) or international",
     },
   ],
-  examples: ["bl auth login --api-key sk-xxxxx", "bl auth login --console"],
+  exampleArgs: ["--api-key sk-xxxxx", "--console"],
   async run(config: Config, flags: GlobalFlags) {
     if (flags.console) {
       if (config.dryRun) {