@clue-ai/cli 0.0.19 → 0.0.21

package/bin/clue-cli.mjs

@@ -876,13 +876,93 @@ const renderEnvironmentInstructions = (instructions) => {
   const lines = [
     "",
     `環境変数の設定内容を ${instructions.env_file_path} に書き出しました。`,
-    `Step2で ${instructions.env_file_path} を開き、各サービスの env と GitHub Secrets/Variables に反映してください。`,
+    `Step2で ${instructions.env_file_path} を開き、各サービスの env、setup-agent 用AI設定、GitHub Secrets/Variables に反映してください。`,
+    `Step3で setup-agent を実行する前に ${instructions.setup_agent_required_env_names?.join(", ") ?? "CLUE_AI_PROVIDER, CLUE_AI_PROVIDER_API_KEY, CLUE_AI_MODEL"} を設定してください。`,
+    "CLUE_AI_PROVIDER_API_KEY は Clue API key ではなく、OpenAI または Anthropic の API key です。",
+    `setup-agent 実行: ${instructions.setup_agent_command ?? clueCliCommand("setup-agent --repo .")}`,
     `${instructions.env_file_path} は秘密情報を含むため、コミットしないでください。`,
     "",
   ];
   return `${lines.join("\n")}\n`;
 };
 
+const renderSetupResult = ({ preparation }) => {
+  if (preparation?.status === "ready_for_ai") {
+    const envPath =
+      preparation.environment_instructions?.env_file_path ?? ".env.clue";
+    const manifestPath =
+      preparation.artifacts?.setup_manifest_path ?? ".clue/setup-manifest.json";
+    const workflowPath =
+      preparation.artifacts?.ci_workflow_path ??
+      ".github/workflows/clue-semantic-snapshot.yml";
+    return [
+      "Clue setup Step1 が完了しました。",
+      "",
+      "作成したファイル:",
+      `- ${envPath}`,
+      `- ${manifestPath}`,
+      `- ${workflowPath}`,
+      "",
+      "次にやること:",
+      `1. setup画面のStep2を見ながら ${envPath} に各サービスのenvとsetup-agent用AI API keyを設定してください。`,
+      `2. ${clueCliCommand("setup-agent --repo .")} を実行してください。`,
+      "",
+      "補足: CLUE_AI_PROVIDER_API_KEY は Clue API key ではなく、OpenAI または Anthropic の API key です。",
+    ].join("\n");
+  }
+
+  const blockers = Array.isArray(preparation?.blockers)
+    ? preparation.blockers
+        .map((blocker) => blocker.message ?? blocker.reason ?? blocker.code)
+        .filter(Boolean)
+    : [];
+  return [
+    "Clue setup に失敗しました。",
+    "",
+    "原因:",
+    ...(blockers.length > 0
+      ? blockers.map((blocker) => `- ${blocker}`)
+      : ["- setup に必要な情報を検出できませんでした。"]),
+  ].join("\n");
+};
+
+const renderSetupAgentResult = (report) => {
+  if (report?.status === "user_verification_pending") {
+    return [
+      "Clue setup-agent の実行が完了しました。",
+      "",
+      "コード差分を確認してください。",
+      `次の動作確認: ${clueCliCommand("setup-watch --local")}`,
+    ].join("\n");
+  }
+
+  if (report?.code === "CLUE_SETUP_AGENT_AI_CONFIG_MISSING") {
+    const missingInputs = report.setup_doctor?.missing_inputs ?? [];
+    return [
+      "Clue setup-agent を開始できません。",
+      "",
+      `不足している環境変数: ${missingInputs.join(", ")}`,
+      "",
+      ".env.clue の Setup Agent セクションに値を設定してから、もう一度実行してください。",
+      "",
+      "例:",
+      "CLUE_AI_PROVIDER=openai",
+      "CLUE_AI_PROVIDER_API_KEY=<your-openai-api-key>",
+      "CLUE_AI_MODEL=gpt-5.4-mini",
+    ].join("\n");
+  }
+
+  const blocker = report?.blockers?.[0];
+  const reason =
+    blocker?.reason ??
+    report?.setup_doctor?.reason ??
+    report?.code ??
+    "原因を特定できませんでした。";
+  return ["Clue setup-agent に失敗しました。", "", `原因: ${reason}`].join(
+    "\n",
+  );
+};
+
 const main = async () => {
   const { command, flags } = parseArgs(process.argv.slice(2));
   if (
@@ -938,7 +1018,11 @@ const main = async () => {
       flags,
       repoRoot,
     });
-    process.stdout.write(`${JSON.stringify(report, null, 2)}\n`);
+    if (flags.has("json")) {
+      process.stdout.write(`${JSON.stringify(report, null, 2)}\n`);
+    } else {
+      process.stdout.write(`${renderSetupAgentResult(report)}\n`);
+    }
     if (report.status === "blocked") {
       process.exitCode = 1;
     }
@@ -993,12 +1077,19 @@ const main = async () => {
     const environmentInstructions = renderEnvironmentInstructions(
       preparation.environment_instructions,
     );
-    if (environmentInstructions) {
+    if (environmentInstructions && flags.has("json")) {
       process.stderr.write(environmentInstructions);
     }
-    process.stdout.write(
-      `${JSON.stringify({ ...report, preparation }, null, 2)}\n`,
-    );
+    if (flags.has("json")) {
+      process.stdout.write(
+        `${JSON.stringify({ ...report, preparation }, null, 2)}\n`,
+      );
+    } else {
+      process.stdout.write(`${renderSetupResult({ preparation })}\n`);
+    }
+    if (!flags.has("json") && preparation.status === "blocked") {
+      process.exitCode = 1;
+    }
     return;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clue-ai/cli",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "type": "module",
   "bin": {
     "clue-ai": "bin/clue-cli.mjs"

package/src/setup-agent.mjs

@@ -10,6 +10,11 @@ import { runSetupDoctor } from "./setup-doctor.mjs";
 const DEFAULT_SETUP_MANIFEST_PATH = ".clue/setup-manifest.json";
 const DEFAULT_ENV_GUIDE_PATH = ".env.clue";
 const DEFAULT_MAX_ATTEMPTS = 3;
+const REQUIRED_SETUP_AGENT_AI_ENV_NAMES = [
+  "CLUE_AI_PROVIDER",
+  "CLUE_AI_PROVIDER_API_KEY",
+  "CLUE_AI_MODEL",
+];
 const DEPENDENCY_WRITE_FILE_CANDIDATES = [
   "package.json",
   "package-lock.json",
@@ -80,6 +85,50 @@ const aiProviderEnvFromFlags = ({ env, flags }) => {
   };
 };
 
+const missingSetupAgentAiEnvNames = (env) =>
+  REQUIRED_SETUP_AGENT_AI_ENV_NAMES.filter((name) => !optionalString(env[name]));
+
+const blockedMissingAiProviderConfig = ({ manifestPath, missingInputs }) => ({
+  status: "blocked",
+  code: "CLUE_SETUP_AGENT_AI_CONFIG_MISSING",
+  manifest_path: manifestPath,
+  attempts: [],
+  setup_check: null,
+  setup_doctor: {
+    status: "skipped",
+    reason: "AI provider configuration is missing",
+    missing_inputs: missingInputs,
+    report: null,
+  },
+  blockers: [
+    {
+      reason:
+        "setup-agent requires CLUE_AI_PROVIDER, CLUE_AI_PROVIDER_API_KEY, and CLUE_AI_MODEL before lifecycle planning",
+      evidence: {
+        missing_inputs: missingInputs,
+        env_file_path: DEFAULT_ENV_GUIDE_PATH,
+        supported_providers: ["openai", "anthropic"],
+        cli_flags: [
+          "--ai-provider",
+          "--ai-provider-api-key",
+          "--ai-model",
+        ],
+      },
+    },
+  ],
+  next_steps: [
+    "Open .env.clue and replace CLUE_AI_PROVIDER_API_KEY with an OpenAI API key for codex or an Anthropic API key for claude_code.",
+    "Confirm CLUE_AI_PROVIDER and CLUE_AI_MODEL are set in .env.clue or process env.",
+    "Alternatively run setup-agent with --ai-provider, --ai-provider-api-key, and --ai-model.",
+  ],
+  user_verification: {
+    setup_watch_owner: "user",
+    setup_watch_auto_run: false,
+    status: "not_reached",
+    required_command: "npx -y @clue-ai/cli setup-watch --local",
+  },
+});
+
 const requireManifest = async ({ manifestPath, repoRoot }) => {
   try {
     return await readJson(resolve(repoRoot, manifestPath));
@@ -344,6 +393,13 @@ export const runSetupAgent = async ({
     DEFAULT_MAX_ATTEMPTS,
   );
   const aiEnv = aiProviderEnvFromFlags({ env: mergedEnv, flags });
+  const missingAiInputs = missingSetupAgentAiEnvNames(aiEnv);
+  if (missingAiInputs.length > 0) {
+    return blockedMissingAiProviderConfig({
+      manifestPath,
+      missingInputs: missingAiInputs,
+    });
+  }
   const attempts = [];
   let failureContext = null;
   let lastSetupCheck = null;

package/src/setup-prepare.mjs

@@ -32,6 +32,11 @@ const BACKEND_RUNTIME_ENV_NAMES = [
   "CLUE_INGEST_ENDPOINT",
   "CLUE_API_KEY",
 ];
+const SETUP_AGENT_AI_ENV_NAMES = [
+  "CLUE_AI_PROVIDER",
+  "CLUE_AI_PROVIDER_API_KEY",
+  "CLUE_AI_MODEL",
+];
 const AI_PROVIDER_GUIDES = {
   codex: {
     provider: "openai",
@@ -352,6 +357,14 @@ const buildEnvironmentGuideText = (instructions) => {
       "",
     );
   }
+  lines.push(
+    "Setup Agent",
+    "# Before running `npx -y @clue-ai/cli setup-agent --repo .`, set the AI provider values below.",
+    "# setup-agent reads CLUE_AI_PROVIDER, CLUE_AI_PROVIDER_API_KEY, and CLUE_AI_MODEL from this file or process env.",
+    "# CLUE_AI_PROVIDER_API_KEY is not a Clue key. It must be an OpenAI key for codex or an Anthropic key for claude_code.",
+    "# You may also pass --ai-provider, --ai-provider-api-key, and --ai-model directly to setup-agent.",
+    "",
+  );
   lines.push(
     "GitHub Secrets",
     ...instructions.ci_github.secrets.flatMap(renderEnvironmentEntry),
@@ -374,7 +387,9 @@ const summarizeEnvironmentInstructions = (instructions) => {
   return {
     status: "ready",
     env_file_path: instructions.env_file_path,
-    message: `${instructions.env_file_path} を開き、各サービスの env と GitHub Secrets に反映してください。`,
+    message: `${instructions.env_file_path} を開き、各サービスの env、setup-agent 用AI設定、GitHub Secrets/Variables に反映してください。`,
+    setup_agent_required_env_names: SETUP_AGENT_AI_ENV_NAMES,
+    setup_agent_command: "npx -y @clue-ai/cli setup-agent --repo .",
     service_env_block_count: instructions.service_env_blocks.length,
     github_secret_names: instructions.ci_github.secrets.map(
       (entry) => entry.name,