From 793668289f021a6aed635587296883cf37c965d8 Mon Sep 17 00:00:00 2001
From: evan-claw <evankiloclaw@gmail.com>
Date: Thu, 19 Mar 2026 21:27:27 +0000
Subject: [PATCH] fix(dev-cli): include prereq checks in envCheck allGood flag

The allGood flag was only set to false by the per-service env loop.
If .env.local was missing or .vercel/project.json was absent, the
function still displayed 'All environment checks passed!' despite
having printed an error or warning above.

Initialize allGood from envLocalExists && vercelLinked so the final
banner correctly reflects all preceding checks.

Adds 4 integration tests that exercise envCheck against a temp
directory tree and assert the banner matches the actual check results.
---
 dev/cli/src/commands/env.ts    |   3 +-
 dev/cli/test/env-check.test.ts | 115 +++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 dev/cli/test/env-check.test.ts

diff --git a/dev/cli/src/commands/env.ts b/dev/cli/src/commands/env.ts
index 9ad741b11f..9aee5298ac 100644
--- a/dev/cli/src/commands/env.ts
+++ b/dev/cli/src/commands/env.ts
@@ -22,8 +22,9 @@ export async function envCheck(root: string) {
     ui.warn('Vercel project not linked — run: vercel link --project kilocode-app');
   }
 
+  let allGood = envLocalExists && vercelLinked;
+
   const servicesWithEnv = services.filter(s => s.envFile);
-  let allGood = true;
 
   for (const svc of servicesWithEnv) {
     const examplePath = join(root, svc.dir, svc.envFile!);
diff --git a/dev/cli/test/env-check.test.ts b/dev/cli/test/env-check.test.ts
new file mode 100644
index 0000000000..7eca83bd31
--- /dev/null
+++ b/dev/cli/test/env-check.test.ts
@@ -0,0 +1,115 @@
+import { describe, expect, test, beforeEach, afterEach } from 'bun:test';
+import { mkdtemp, rm, mkdir, writeFile } from 'fs/promises';
+import { join } from 'path';
+import { tmpdir } from 'os';
+
+/**
+ * Tests for envCheck that verify the final banner correctly reflects
+ * the state of ALL checks, including .env.local and .vercel/project.json.
+ *
+ * To isolate the pre-requisite checks from per-service env checks, we
+ * create all required service .dev.vars files (with valid content) in
+ * the temp tree so the service loop doesn't contribute failures.
+ */
+
+// Import services to know which dirs need .dev.vars
+import { services } from '../src/services/registry';
+import { envCheck } from '../src/commands/env';
+
+let root: string;
+let logs: string[];
+let errors: string[];
+let origLog: typeof console.log;
+let origError: typeof console.error;
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'env-check-test-'));
+  logs = [];
+  errors = [];
+  origLog = console.log;
+  origError = console.error;
+  console.log = (...args: unknown[]) => logs.push(args.map(String).join(' '));
+  console.error = (...args: unknown[]) => errors.push(args.map(String).join(' '));
+});
+
+afterEach(async () => {
+  console.log = origLog;
+  console.error = origError;
+  await rm(root, { recursive: true, force: true });
+});
+
+function allOutput(): string {
+  return [...logs, ...errors].join('\n');
+}
+
+/**
+ * Creates all service .dev.vars AND their .dev.vars.example files so
+ * that the per-service loop produces no warnings. The .dev.vars files
+ * contain the same keys with non-placeholder values.
+ */
+async function createAllServiceEnvFiles() {
+  const servicesWithEnv = services.filter(s => s.envFile);
+  for (const svc of servicesWithEnv) {
+    const dir = join(root, svc.dir);
+    await mkdir(dir, { recursive: true });
+    // Create example file with a non-placeholder value
+    const exampleContent = 'SOME_KEY=real-value\n';
+    await writeFile(join(dir, svc.envFile!), exampleContent);
+    // Create actual .dev.vars with matching real value
+    await writeFile(join(dir, '.dev.vars'), 'SOME_KEY=real-value\n');
+  }
+}
+
+describe('envCheck final banner', () => {
+  test('missing .env.local → banner should say "needs attention", not "passed"', async () => {
+    // .env.local does NOT exist, .vercel/project.json DOES
+    await mkdir(join(root, '.vercel'), { recursive: true });
+    await writeFile(join(root, '.vercel', 'project.json'), '{}');
+    await createAllServiceEnvFiles();
+
+    await envCheck(root);
+
+    const output = allOutput();
+    expect(output).toContain('.env.local missing');
+    expect(output).not.toContain('All environment checks passed');
+    expect(output).toContain('Some checks need attention');
+  });
+
+  test('missing .vercel/project.json → banner should say "needs attention", not "passed"', async () => {
+    // .env.local EXISTS, .vercel/project.json does NOT
+    await writeFile(join(root, '.env.local'), 'KEY=value');
+    await createAllServiceEnvFiles();
+
+    await envCheck(root);
+
+    const output = allOutput();
+    expect(output).toContain('Vercel project not linked');
+    expect(output).not.toContain('All environment checks passed');
+    expect(output).toContain('Some checks need attention');
+  });
+
+  test('both prereqs missing → banner should say "needs attention"', async () => {
+    await createAllServiceEnvFiles();
+
+    await envCheck(root);
+
+    const output = allOutput();
+    expect(output).toContain('.env.local missing');
+    expect(output).toContain('Vercel project not linked');
+    expect(output).not.toContain('All environment checks passed');
+    expect(output).toContain('Some checks need attention');
+  });
+
+  test('all prereqs present + all service envs OK → banner says "passed"', async () => {
+    await writeFile(join(root, '.env.local'), 'KEY=value');
+    await mkdir(join(root, '.vercel'), { recursive: true });
+    await writeFile(join(root, '.vercel', 'project.json'), '{}');
+    await createAllServiceEnvFiles();
+
+    await envCheck(root);
+
+    const output = allOutput();
+    expect(output).toContain('All environment checks passed');
+    expect(output).not.toContain('Some checks need attention');
+  });
+});