@codebakers/cli 1.2.1 → 1.3.0

package/dist/templates/nextjs-supabase.d.ts

@@ -0,0 +1,81 @@
+export declare const PACKAGE_JSON: {
+    name: string;
+    version: string;
+    private: boolean;
+    scripts: {
+        dev: string;
+        build: string;
+        start: string;
+        lint: string;
+        "db:generate": string;
+        "db:push": string;
+        "db:studio": string;
+    };
+    dependencies: {
+        next: string;
+        react: string;
+        "react-dom": string;
+        "@supabase/supabase-js": string;
+        "@supabase/ssr": string;
+        "drizzle-orm": string;
+        postgres: string;
+        zod: string;
+        "react-hook-form": string;
+        "@hookform/resolvers": string;
+        "lucide-react": string;
+        clsx: string;
+        "tailwind-merge": string;
+    };
+    devDependencies: {
+        "@types/node": string;
+        "@types/react": string;
+        "@types/react-dom": string;
+        typescript: string;
+        tailwindcss: string;
+        postcss: string;
+        autoprefixer: string;
+        "drizzle-kit": string;
+        eslint: string;
+        "eslint-config-next": string;
+    };
+};
+export declare const ENV_EXAMPLE = "# Supabase\nNEXT_PUBLIC_SUPABASE_URL=your-supabase-url\nNEXT_PUBLIC_SUPABASE_ANON_KEY=your-anon-key\nSUPABASE_SERVICE_ROLE_KEY=your-service-role-key\n\n# Database (from Supabase connection string)\nDATABASE_URL=postgresql://postgres:[password]@db.[project-ref].supabase.co:5432/postgres\n";
+export declare const DRIZZLE_CONFIG = "import { defineConfig } from \"drizzle-kit\";\n\nexport default defineConfig({\n  schema: \"./src/db/schema.ts\",\n  out: \"./src/db/migrations\",\n  dialect: \"postgresql\",\n  dbCredentials: {\n    url: process.env.DATABASE_URL!,\n  },\n});\n";
+export declare const DB_SCHEMA = "import { pgTable, text, timestamp, uuid, boolean } from \"drizzle-orm/pg-core\";\n\n// Users table (synced with Supabase Auth)\nexport const users = pgTable(\"users\", {\n  id: uuid(\"id\").primaryKey().notNull(),\n  email: text(\"email\").notNull().unique(),\n  name: text(\"name\"),\n  avatarUrl: text(\"avatar_url\"),\n  createdAt: timestamp(\"created_at\").defaultNow().notNull(),\n  updatedAt: timestamp(\"updated_at\").defaultNow().notNull(),\n});\n\n// Example: Add your tables here following this pattern\n// export const posts = pgTable(\"posts\", {\n//   id: uuid(\"id\").primaryKey().defaultRandom(),\n//   title: text(\"title\").notNull(),\n//   content: text(\"content\"),\n//   authorId: uuid(\"author_id\").references(() => users.id),\n//   published: boolean(\"published\").default(false),\n//   createdAt: timestamp(\"created_at\").defaultNow().notNull(),\n// });\n";
+export declare const DB_INDEX = "import { drizzle } from \"drizzle-orm/postgres-js\";\nimport postgres from \"postgres\";\nimport * as schema from \"./schema\";\n\nconst connectionString = process.env.DATABASE_URL!;\n\nconst client = postgres(connectionString, { prepare: false });\nexport const db = drizzle(client, { schema });\n\nexport type DB = typeof db;\n";
+export declare const SUPABASE_SERVER = "import { createServerClient } from \"@supabase/ssr\";\nimport { cookies } from \"next/headers\";\n\nexport async function createClient() {\n  const cookieStore = await cookies();\n\n  return createServerClient(\n    process.env.NEXT_PUBLIC_SUPABASE_URL!,\n    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,\n    {\n      cookies: {\n        getAll() {\n          return cookieStore.getAll();\n        },\n        setAll(cookiesToSet) {\n          try {\n            cookiesToSet.forEach(({ name, value, options }) =>\n              cookieStore.set(name, value, options)\n            );\n          } catch {\n            // The `setAll` method was called from a Server Component.\n            // This can be ignored if you have middleware refreshing user sessions.\n          }\n        },\n      },\n    }\n  );\n}\n";
+export declare const SUPABASE_CLIENT = "import { createBrowserClient } from \"@supabase/ssr\";\n\nexport function createClient() {\n  return createBrowserClient(\n    process.env.NEXT_PUBLIC_SUPABASE_URL!,\n    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!\n  );\n}\n";
+export declare const SUPABASE_MIDDLEWARE = "import { createServerClient } from \"@supabase/ssr\";\nimport { NextResponse, type NextRequest } from \"next/server\";\n\nexport async function updateSession(request: NextRequest) {\n  let supabaseResponse = NextResponse.next({\n    request,\n  });\n\n  const supabase = createServerClient(\n    process.env.NEXT_PUBLIC_SUPABASE_URL!,\n    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,\n    {\n      cookies: {\n        getAll() {\n          return request.cookies.getAll();\n        },\n        setAll(cookiesToSet) {\n          cookiesToSet.forEach(({ name, value }) =>\n            request.cookies.set(name, value)\n          );\n          supabaseResponse = NextResponse.next({\n            request,\n          });\n          cookiesToSet.forEach(({ name, value, options }) =>\n            supabaseResponse.cookies.set(name, value, options)\n          );\n        },\n      },\n    }\n  );\n\n  // This will refresh session if expired\n  await supabase.auth.getUser();\n\n  return supabaseResponse;\n}\n";
+export declare const MIDDLEWARE = "import { type NextRequest } from \"next/server\";\nimport { updateSession } from \"@/lib/supabase/middleware\";\n\nexport async function middleware(request: NextRequest) {\n  return await updateSession(request);\n}\n\nexport const config = {\n  matcher: [\n    /*\n     * Match all request paths except for:\n     * - _next/static (static files)\n     * - _next/image (image optimization)\n     * - favicon.ico\n     * - public files\n     */\n    \"/((?!_next/static|_next/image|favicon.ico|.*\\\\.(?:svg|png|jpg|jpeg|gif|webp)$).*)\",\n  ],\n};\n";
+export declare const TAILWIND_CONFIG = "import type { Config } from \"tailwindcss\";\n\nconst config: Config = {\n  content: [\n    \"./src/pages/**/*.{js,ts,jsx,tsx,mdx}\",\n    \"./src/components/**/*.{js,ts,jsx,tsx,mdx}\",\n    \"./src/app/**/*.{js,ts,jsx,tsx,mdx}\",\n  ],\n  theme: {\n    extend: {},\n  },\n  plugins: [],\n};\nexport default config;\n";
+export declare const POSTCSS_CONFIG = "module.exports = {\n  plugins: {\n    tailwindcss: {},\n    autoprefixer: {},\n  },\n};\n";
+export declare const TSCONFIG: {
+    compilerOptions: {
+        lib: string[];
+        allowJs: boolean;
+        skipLibCheck: boolean;
+        strict: boolean;
+        noEmit: boolean;
+        esModuleInterop: boolean;
+        module: string;
+        moduleResolution: string;
+        resolveJsonModule: boolean;
+        isolatedModules: boolean;
+        jsx: string;
+        incremental: boolean;
+        plugins: {
+            name: string;
+        }[];
+        paths: {
+            "@/*": string[];
+        };
+    };
+    include: string[];
+    exclude: string[];
+};
+export declare const NEXT_CONFIG = "import type { NextConfig } from \"next\";\n\nconst nextConfig: NextConfig = {\n  /* config options here */\n};\n\nexport default nextConfig;\n";
+export declare const GLOBALS_CSS = "@tailwind base;\n@tailwind components;\n@tailwind utilities;\n\n:root {\n  --background: #ffffff;\n  --foreground: #171717;\n}\n\n@media (prefers-color-scheme: dark) {\n  :root {\n    --background: #0a0a0a;\n    --foreground: #ededed;\n  }\n}\n\nbody {\n  color: var(--foreground);\n  background: var(--background);\n  font-family: Arial, Helvetica, sans-serif;\n}\n";
+export declare const LAYOUT_TSX = "import type { Metadata } from \"next\";\nimport \"./globals.css\";\n\nexport const metadata: Metadata = {\n  title: \"My App\",\n  description: \"Built with CodeBakers patterns\",\n};\n\nexport default function RootLayout({\n  children,\n}: Readonly<{\n  children: React.ReactNode;\n}>) {\n  return (\n    <html lang=\"en\">\n      <body>{children}</body>\n    </html>\n  );\n}\n";
+export declare const PAGE_TSX = "export default function Home() {\n  return (\n    <main className=\"flex min-h-screen flex-col items-center justify-center p-24\">\n      <h1 className=\"text-4xl font-bold mb-4\">Welcome to Your App</h1>\n      <p className=\"text-gray-600 mb-8\">Built with CodeBakers patterns</p>\n      <div className=\"flex gap-4\">\n        <a\n          href=\"/login\"\n          className=\"px-6 py-3 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition\"\n        >\n          Get Started\n        </a>\n        <a\n          href=\"/docs\"\n          className=\"px-6 py-3 border border-gray-300 rounded-lg hover:bg-gray-50 transition\"\n        >\n          Documentation\n        </a>\n      </div>\n    </main>\n  );\n}\n";
+export declare const UTILS_CN = "import { clsx, type ClassValue } from \"clsx\";\nimport { twMerge } from \"tailwind-merge\";\n\nexport function cn(...inputs: ClassValue[]) {\n  return twMerge(clsx(inputs));\n}\n";
+export declare const GITIGNORE = "# Dependencies\nnode_modules\n.pnpm-debug.log*\n\n# Next.js\n.next/\nout/\n\n# Production\nbuild\ndist\n\n# Misc\n.DS_Store\n*.pem\n\n# Debug\nnpm-debug.log*\nyarn-debug.log*\nyarn-error.log*\n\n# Local env files\n.env\n.env.local\n.env.development.local\n.env.test.local\n.env.production.local\n\n# Vercel\n.vercel\n\n# TypeScript\n*.tsbuildinfo\nnext-env.d.ts\n\n# IDE\n.idea\n.vscode/*\n!.vscode/settings.json\n";

package/dist/templates/nextjs-supabase.js

@@ -0,0 +1,356 @@
+"use strict";
+// Next.js + Supabase + Drizzle project template
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GITIGNORE = exports.UTILS_CN = exports.PAGE_TSX = exports.LAYOUT_TSX = exports.GLOBALS_CSS = exports.NEXT_CONFIG = exports.TSCONFIG = exports.POSTCSS_CONFIG = exports.TAILWIND_CONFIG = exports.MIDDLEWARE = exports.SUPABASE_MIDDLEWARE = exports.SUPABASE_CLIENT = exports.SUPABASE_SERVER = exports.DB_INDEX = exports.DB_SCHEMA = exports.DRIZZLE_CONFIG = exports.ENV_EXAMPLE = exports.PACKAGE_JSON = void 0;
+exports.PACKAGE_JSON = {
+    name: "my-project",
+    version: "0.1.0",
+    private: true,
+    scripts: {
+        "dev": "next dev",
+        "build": "next build",
+        "start": "next start",
+        "lint": "next lint",
+        "db:generate": "drizzle-kit generate",
+        "db:push": "drizzle-kit push",
+        "db:studio": "drizzle-kit studio"
+    },
+    dependencies: {
+        "next": "15.1.0",
+        "react": "^19.0.0",
+        "react-dom": "^19.0.0",
+        "@supabase/supabase-js": "^2.47.10",
+        "@supabase/ssr": "^0.5.2",
+        "drizzle-orm": "^0.38.2",
+        "postgres": "^3.4.5",
+        "zod": "^3.24.1",
+        "react-hook-form": "^7.54.1",
+        "@hookform/resolvers": "^3.9.1",
+        "lucide-react": "^0.468.0",
+        "clsx": "^2.1.1",
+        "tailwind-merge": "^2.6.0"
+    },
+    devDependencies: {
+        "@types/node": "^22.10.2",
+        "@types/react": "^19.0.1",
+        "@types/react-dom": "^19.0.1",
+        "typescript": "^5.7.2",
+        "tailwindcss": "^3.4.17",
+        "postcss": "^8.4.49",
+        "autoprefixer": "^10.4.20",
+        "drizzle-kit": "^0.30.1",
+        "eslint": "^9.17.0",
+        "eslint-config-next": "15.1.0"
+    }
+};
+exports.ENV_EXAMPLE = `# Supabase
+NEXT_PUBLIC_SUPABASE_URL=your-supabase-url
+NEXT_PUBLIC_SUPABASE_ANON_KEY=your-anon-key
+SUPABASE_SERVICE_ROLE_KEY=your-service-role-key
+
+# Database (from Supabase connection string)
+DATABASE_URL=postgresql://postgres:[password]@db.[project-ref].supabase.co:5432/postgres
+`;
+exports.DRIZZLE_CONFIG = `import { defineConfig } from "drizzle-kit";
+
+export default defineConfig({
+  schema: "./src/db/schema.ts",
+  out: "./src/db/migrations",
+  dialect: "postgresql",
+  dbCredentials: {
+    url: process.env.DATABASE_URL!,
+  },
+});
+`;
+exports.DB_SCHEMA = `import { pgTable, text, timestamp, uuid, boolean } from "drizzle-orm/pg-core";
+
+// Users table (synced with Supabase Auth)
+export const users = pgTable("users", {
+  id: uuid("id").primaryKey().notNull(),
+  email: text("email").notNull().unique(),
+  name: text("name"),
+  avatarUrl: text("avatar_url"),
+  createdAt: timestamp("created_at").defaultNow().notNull(),
+  updatedAt: timestamp("updated_at").defaultNow().notNull(),
+});
+
+// Example: Add your tables here following this pattern
+// export const posts = pgTable("posts", {
+//   id: uuid("id").primaryKey().defaultRandom(),
+//   title: text("title").notNull(),
+//   content: text("content"),
+//   authorId: uuid("author_id").references(() => users.id),
+//   published: boolean("published").default(false),
+//   createdAt: timestamp("created_at").defaultNow().notNull(),
+// });
+`;
+exports.DB_INDEX = `import { drizzle } from "drizzle-orm/postgres-js";
+import postgres from "postgres";
+import * as schema from "./schema";
+
+const connectionString = process.env.DATABASE_URL!;
+
+const client = postgres(connectionString, { prepare: false });
+export const db = drizzle(client, { schema });
+
+export type DB = typeof db;
+`;
+exports.SUPABASE_SERVER = `import { createServerClient } from "@supabase/ssr";
+import { cookies } from "next/headers";
+
+export async function createClient() {
+  const cookieStore = await cookies();
+
+  return createServerClient(
+    process.env.NEXT_PUBLIC_SUPABASE_URL!,
+    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
+    {
+      cookies: {
+        getAll() {
+          return cookieStore.getAll();
+        },
+        setAll(cookiesToSet) {
+          try {
+            cookiesToSet.forEach(({ name, value, options }) =>
+              cookieStore.set(name, value, options)
+            );
+          } catch {
+            // The \`setAll\` method was called from a Server Component.
+            // This can be ignored if you have middleware refreshing user sessions.
+          }
+        },
+      },
+    }
+  );
+}
+`;
+exports.SUPABASE_CLIENT = `import { createBrowserClient } from "@supabase/ssr";
+
+export function createClient() {
+  return createBrowserClient(
+    process.env.NEXT_PUBLIC_SUPABASE_URL!,
+    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!
+  );
+}
+`;
+exports.SUPABASE_MIDDLEWARE = `import { createServerClient } from "@supabase/ssr";
+import { NextResponse, type NextRequest } from "next/server";
+
+export async function updateSession(request: NextRequest) {
+  let supabaseResponse = NextResponse.next({
+    request,
+  });
+
+  const supabase = createServerClient(
+    process.env.NEXT_PUBLIC_SUPABASE_URL!,
+    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
+    {
+      cookies: {
+        getAll() {
+          return request.cookies.getAll();
+        },
+        setAll(cookiesToSet) {
+          cookiesToSet.forEach(({ name, value }) =>
+            request.cookies.set(name, value)
+          );
+          supabaseResponse = NextResponse.next({
+            request,
+          });
+          cookiesToSet.forEach(({ name, value, options }) =>
+            supabaseResponse.cookies.set(name, value, options)
+          );
+        },
+      },
+    }
+  );
+
+  // This will refresh session if expired
+  await supabase.auth.getUser();
+
+  return supabaseResponse;
+}
+`;
+exports.MIDDLEWARE = `import { type NextRequest } from "next/server";
+import { updateSession } from "@/lib/supabase/middleware";
+
+export async function middleware(request: NextRequest) {
+  return await updateSession(request);
+}
+
+export const config = {
+  matcher: [
+    /*
+     * Match all request paths except for:
+     * - _next/static (static files)
+     * - _next/image (image optimization)
+     * - favicon.ico
+     * - public files
+     */
+    "/((?!_next/static|_next/image|favicon.ico|.*\\\\.(?:svg|png|jpg|jpeg|gif|webp)$).*)",
+  ],
+};
+`;
+exports.TAILWIND_CONFIG = `import type { Config } from "tailwindcss";
+
+const config: Config = {
+  content: [
+    "./src/pages/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/components/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/app/**/*.{js,ts,jsx,tsx,mdx}",
+  ],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+};
+export default config;
+`;
+exports.POSTCSS_CONFIG = `module.exports = {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+};
+`;
+exports.TSCONFIG = {
+    compilerOptions: {
+        lib: ["dom", "dom.iterable", "esnext"],
+        allowJs: true,
+        skipLibCheck: true,
+        strict: true,
+        noEmit: true,
+        esModuleInterop: true,
+        module: "esnext",
+        moduleResolution: "bundler",
+        resolveJsonModule: true,
+        isolatedModules: true,
+        jsx: "preserve",
+        incremental: true,
+        plugins: [{ name: "next" }],
+        paths: {
+            "@/*": ["./src/*"]
+        }
+    },
+    include: ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+    exclude: ["node_modules"]
+};
+exports.NEXT_CONFIG = `import type { NextConfig } from "next";
+
+const nextConfig: NextConfig = {
+  /* config options here */
+};
+
+export default nextConfig;
+`;
+exports.GLOBALS_CSS = `@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+:root {
+  --background: #ffffff;
+  --foreground: #171717;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --background: #0a0a0a;
+    --foreground: #ededed;
+  }
+}
+
+body {
+  color: var(--foreground);
+  background: var(--background);
+  font-family: Arial, Helvetica, sans-serif;
+}
+`;
+exports.LAYOUT_TSX = `import type { Metadata } from "next";
+import "./globals.css";
+
+export const metadata: Metadata = {
+  title: "My App",
+  description: "Built with CodeBakers patterns",
+};
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  );
+}
+`;
+exports.PAGE_TSX = `export default function Home() {
+  return (
+    <main className="flex min-h-screen flex-col items-center justify-center p-24">
+      <h1 className="text-4xl font-bold mb-4">Welcome to Your App</h1>
+      <p className="text-gray-600 mb-8">Built with CodeBakers patterns</p>
+      <div className="flex gap-4">
+        <a
+          href="/login"
+          className="px-6 py-3 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition"
+        >
+          Get Started
+        </a>
+        <a
+          href="/docs"
+          className="px-6 py-3 border border-gray-300 rounded-lg hover:bg-gray-50 transition"
+        >
+          Documentation
+        </a>
+      </div>
+    </main>
+  );
+}
+`;
+exports.UTILS_CN = `import { clsx, type ClassValue } from "clsx";
+import { twMerge } from "tailwind-merge";
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs));
+}
+`;
+exports.GITIGNORE = `# Dependencies
+node_modules
+.pnpm-debug.log*
+
+# Next.js
+.next/
+out/
+
+# Production
+build
+dist
+
+# Misc
+.DS_Store
+*.pem
+
+# Debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Local env files
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# Vercel
+.vercel
+
+# TypeScript
+*.tsbuildinfo
+next-env.d.ts
+
+# IDE
+.idea
+.vscode/*
+!.vscode/settings.json
+`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebakers/cli",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "CodeBakers CLI - Production patterns for AI-assisted development",
   "main": "dist/index.js",
   "bin": {

package/src/commands/install-hook.ts

@@ -4,71 +4,40 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync, copyFileSync } from
 import { join } from 'path';
 import { homedir } from 'os';
 
-// Enhanced hook with pre-flight checks and self-review automation
+// Enhanced hook with visible feedback and concise instructions
 const HOOK_TEMPLATE = {
   hooks: {
     UserPromptSubmit: [
       {
         type: "command",
-        command: `echo '════════════════════════════════════════════════════════════════
-🚀 CODEBAKERS ZERO-FRICTION PROTOCOL
-════════════════════════════════════════════════════════════════
-
-AUTOMATIC WORKFLOW - Execute silently, output only the acknowledgment:
-
-▸ PHASE 1: CONTEXT LOAD
-  Read these files (if they exist):
-  - CLAUDE.md → Router & module instructions
-  - PRD.md → What we are building (requirements!)
-  - PROJECT-CONTEXT.md → Codebase knowledge
-  - PROJECT-STATE.md → What is in progress
-  - DECISIONS.md → Past architectural choices
-
-▸ PHASE 2: PRE-FLIGHT CHECK (before writing code)
-  □ What existing code does this touch?
-  □ Is similar code in the codebase? (copy that pattern!)
-  □ Whats the data model?
-  □ What are the error cases?
-  □ Is someone else working on this? (check In Progress)
-
-  If PROJECT-CONTEXT.md is empty/stale, SCAN PROJECT FIRST:
-  - Read package.json
-  - Check file structure
-  - Find existing patterns
-  - Update PROJECT-CONTEXT.md
-
-▸ PHASE 3: ACKNOWLEDGE & EXECUTE
-  Output: 📋 CodeBakers | [Type] | Modules: [list]
-  Then: Follow patterns from .claude/ folder EXACTLY
-
-▸ PHASE 4: SELF-REVIEW (before saying done)
-  □ TypeScript compiles? (npx tsc --noEmit)
-  □ Imports resolve?
-  □ Error handling exists?
-  □ Matches existing patterns?
-  □ Tests written?
-
-  If ANY fails → FIX before responding
-
-▸ PHASE 5: UPDATE STATE
-  - Update PROJECT-STATE.md (move to Completed)
-  - Add to DECISIONS.md if architectural choice made
-
-════════════════════════════════════════════════════════════════
-🔄 MULTI-AGENT MODE
-════════════════════════════════════════════════════════════════
-- Check PROJECT-STATE.md "In Progress" - dont duplicate work
-- Add YOUR task to In Progress when starting
-- If conflict → STOP and ask user
-
-════════════════════════════════════════════════════════════════
-💡 REMEMBER: Check existing code FIRST. Copy patterns. Validate.
-════════════════════════════════════════════════════════════════'`
+        command: `echo '[CodeBakers] Loading project context...'`
+      }
+    ],
+    PostToolUse: [
+      {
+        type: "command",
+        matcher: "Write|Edit",
+        command: `echo '[CodeBakers] Code written - remember to self-review before marking done'`
       }
     ]
   }
 };
 
+// Instructions that get injected into the system prompt
+const CODEBAKERS_INSTRUCTIONS = `
+<user-prompt-submit-hook>
+[CodeBakers] Active - Follow these steps for EVERY request:
+
+1. CONTEXT: Read CLAUDE.md, PROJECT-CONTEXT.md, PROJECT-STATE.md
+2. PRE-FLIGHT: Check existing code patterns before writing new code
+3. EXECUTE: Use patterns from .claude/ folder
+4. SELF-REVIEW: Verify TypeScript compiles, imports resolve, error handling exists
+5. UPDATE: Mark tasks complete in PROJECT-STATE.md
+
+Output format: "[CodeBakers] Building [feature] using [patterns]"
+</user-prompt-submit-hook>
+`;
+
 /**
  * Install the CodeBakers hook into ~/.claude/settings.json
  */
@@ -117,23 +86,25 @@ export async function installHook(): Promise<void> {
       }
     }
 
-    // Merge hook into settings
+    // Merge hooks into settings
     settings.hooks = settings.hooks || {};
     (settings.hooks as Record<string, unknown>).UserPromptSubmit = HOOK_TEMPLATE.hooks.UserPromptSubmit;
+    (settings.hooks as Record<string, unknown>).PostToolUse = HOOK_TEMPLATE.hooks.PostToolUse;
 
     // Write back
     writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
 
     spinner.succeed('Hook installed successfully!');
 
-    console.log(chalk.white('\n  What happens automatically on EVERY message:\n'));
-    console.log(chalk.gray('    ✓ Loads project context (CLAUDE.md, PROJECT-CONTEXT.md)'));
-    console.log(chalk.gray('    ✓ Checks what\'s in progress (PROJECT-STATE.md)'));
-    console.log(chalk.gray('    ✓ Runs pre-flight checks before coding'));
-    console.log(chalk.gray('    ✓ Copies existing patterns from your codebase'));
-    console.log(chalk.gray('    ✓ Self-reviews code before outputting'));
-    console.log(chalk.gray('    ✓ Updates project state when done'));
-    console.log(chalk.gray('    ✓ Logs architectural decisions\n'));
+    console.log(chalk.white('\n  You\'ll see [CodeBakers] feedback in terminal:\n'));
+    console.log(chalk.cyan('    [CodeBakers] Loading project context...'));
+    console.log(chalk.cyan('    [CodeBakers] Code written - remember to self-review\n'));
+
+    console.log(chalk.white('  What happens automatically:\n'));
+    console.log(chalk.gray('    ✓ Loads project context before every response'));
+    console.log(chalk.gray('    ✓ Pre-flight checks before writing code'));
+    console.log(chalk.gray('    ✓ Self-review reminders after code changes'));
+    console.log(chalk.gray('    ✓ Pattern-based development from .claude/ folder\n'));
 
     console.log(chalk.yellow('  ⚠️  Restart Claude Code for changes to take effect.\n'));
   } catch (error) {
@@ -162,13 +133,18 @@ export async function uninstallHook(): Promise<void> {
 
     const settings = JSON.parse(readFileSync(settingsPath, 'utf-8'));
 
-    if (!settings.hooks?.UserPromptSubmit) {
-      spinner.info('No UserPromptSubmit hook found. Nothing to remove.');
+    if (!settings.hooks?.UserPromptSubmit && !settings.hooks?.PostToolUse) {
+      spinner.info('No CodeBakers hooks found. Nothing to remove.');
       return;
     }
 
-    // Remove the hook
-    delete settings.hooks.UserPromptSubmit;
+    // Remove both hooks
+    if (settings.hooks?.UserPromptSubmit) {
+      delete settings.hooks.UserPromptSubmit;
+    }
+    if (settings.hooks?.PostToolUse) {
+      delete settings.hooks.PostToolUse;
+    }
 
     // Clean up empty hooks object
     if (Object.keys(settings.hooks).length === 0) {