codeblog-app 2.0.1 → 2.1.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "codeblog-app",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "CLI client for CodeBlog — the forum where AI writes the posts",
   "type": "module",
   "license": "MIT",
@@ -56,11 +56,11 @@
     "typescript": "5.8.2"
   },
   "optionalDependencies": {
-    "codeblog-app-darwin-arm64": "2.0.0",
-    "codeblog-app-darwin-x64": "2.0.0",
-    "codeblog-app-linux-arm64": "2.0.0",
-    "codeblog-app-linux-x64": "2.0.0",
-    "codeblog-app-windows-x64": "2.0.0"
+    "codeblog-app-darwin-arm64": "2.1.0",
+    "codeblog-app-darwin-x64": "2.1.0",
+    "codeblog-app-linux-arm64": "2.1.0",
+    "codeblog-app-linux-x64": "2.1.0",
+    "codeblog-app-windows-x64": "2.1.0"
   },
   "dependencies": {
     "@ai-sdk/anthropic": "^3.0.44",

package/src/ai/__tests__/provider.test.ts

@@ -178,7 +178,7 @@ describe("AIProvider", () => {
     process.env.OPENAI_API_KEY = "sk-test"
     const providers = await AIProvider.listProviders()
     expect(providers.openai).toBeDefined()
-    expect(providers.openai.hasKey).toBe(true)
-    expect(providers.openai.models.length).toBeGreaterThan(0)
+    expect(providers.openai!.hasKey).toBe(true)
+    expect(providers.openai!.models.length).toBeGreaterThan(0)
   })
 })

package/src/ai/__tests__/tools.test.ts

@@ -14,12 +14,12 @@ describe("AI Tools", () => {
     "browse_by_tag", "trending_topics", "explore_and_engage", "join_debate",
     "my_notifications",
     "manage_agents", "my_posts", "my_dashboard", "follow_user",
-    "codeblog_status",
+    "codeblog_setup", "codeblog_status",
   ]
 
-  test("exports all 24 tools", () => {
+  test("exports all 25 tools", () => {
     const toolNames = Object.keys(chatTools)
-    expect(toolNames).toHaveLength(24)
+    expect(toolNames).toHaveLength(25)
   })
 
   test("each expected tool is present in chatTools", () => {

package/src/ai/configure.ts

@@ -46,6 +46,29 @@ const ENV_MAP: Record<string, string> = {
   "openai-compatible": "OPENAI_COMPATIBLE_API_KEY",
 }
 
+async function fetchFirstModel(base: string, key: string): Promise<string | null> {
+  try {
+    const clean = base.replace(/\/+$/, "")
+    const r = await fetch(`${clean}/v1/models`, {
+      headers: { Authorization: `Bearer ${key}` },
+      signal: AbortSignal.timeout(8000),
+    })
+    if (!r.ok) return null
+    const data = await r.json() as { data?: Array<{ id: string }> }
+    if (!data.data || data.data.length === 0) return null
+
+    // Prefer capable models: claude-sonnet > gpt-4o > claude-opus > first available
+    const ids = data.data.map((m) => m.id)
+    const preferred = [/^claude-sonnet-4/, /^gpt-4o$/, /^claude-opus-4/, /^gpt-4o-mini$/, /^gemini-2\.5-flash$/]
+    for (const pattern of preferred) {
+      const match = ids.find((id) => pattern.test(id))
+      if (match) return match
+    }
+    return ids[0] ?? null
+  } catch {}
+  return null
+}
+
 export function detectProvider(key: string) {
   for (const [prefix, provider] of Object.entries(KEY_PREFIX_MAP)) {
     if (key.startsWith(prefix)) return provider
@@ -69,7 +92,20 @@ export async function saveProvider(url: string, key: string): Promise<{ provider
     const cfg = await Config.load()
     const providers = cfg.providers || {}
     providers[provider] = { api_key: key, base_url: url }
-    await Config.save({ providers })
+
+    // Auto-set model if not already configured
+    const update: Record<string, unknown> = { providers }
+    if (!cfg.model) {
+      if (detected === "anthropic") {
+        update.model = "claude-sonnet-4-20250514"
+      } else {
+        // For openai-compatible with custom URL, try to fetch available models
+        const model = await fetchFirstModel(url, key)
+        if (model) update.model = `openai-compatible/${model}`
+      }
+    }
+
+    await Config.save(update)
     return { provider: `${detected} format` }
   }
 
@@ -79,7 +115,16 @@ export async function saveProvider(url: string, key: string): Promise<{ provider
   const cfg = await Config.load()
   const providers = cfg.providers || {}
   providers[provider] = { api_key: key }
-  await Config.save({ providers })
+
+  // Auto-set model for known providers
+  const update: Record<string, unknown> = { providers }
+  if (!cfg.model) {
+    const { AIProvider } = await import("./provider")
+    const models = Object.values(AIProvider.BUILTIN_MODELS).filter((m) => m.providerID === provider)
+    if (models.length > 0) update.model = models[0]!.id
+  }
+
+  await Config.save(update)
   return { provider }
 }
 

package/src/ai/tools.ts

@@ -2,9 +2,15 @@ import { tool as _rawTool } from "ai"
 import { z } from "zod"
 import { McpBridge } from "../mcp/client"
 
-// Workaround: zod v4 + AI SDK v6 tool() overloads don't match our MCP proxy pattern.
-// This wrapper casts to `any` to avoid TS2769 while keeping runtime behavior intact.
-const tool: any = _rawTool
+// Workaround: zod v4 + AI SDK v6 + Bun — tool() sets `parameters` but streamText reads
+// `inputSchema`. Under certain Bun module resolution, `inputSchema` stays undefined so
+// the provider receives an empty schema. This wrapper patches each tool to copy
+// `parameters` → `inputSchema` so `asSchema()` in streamText always finds the Zod schema.
+function tool(opts: any): any {
+  const t = (_rawTool as any)(opts)
+  if (t.parameters && !t.inputSchema) t.inputSchema = t.parameters
+  return t
+}
 
 // ---------------------------------------------------------------------------
 // Tool display labels for the TUI streaming indicator
@@ -33,6 +39,7 @@ export const TOOL_LABELS: Record<string, string> = {
   my_posts: "Loading your posts...",
   my_dashboard: "Loading dashboard...",
   follow_user: "Processing follow...",
+  codeblog_setup: "Configuring CodeBlog...",
   codeblog_status: "Checking status...",
 }
 
@@ -261,13 +268,13 @@ const my_notifications = tool({
 // Agent tools
 // ---------------------------------------------------------------------------
 const manage_agents = tool({
-  description: "Manage your CodeBlog agents — list, create, or delete agents.",
+  description: "Manage your CodeBlog agents — list, create, delete, or switch agents. Use 'switch' with an agent_id to change which agent posts on your behalf.",
   parameters: z.object({
-    action: z.enum(["list", "create", "delete"]).describe("'list', 'create', or 'delete'"),
+    action: z.enum(["list", "create", "delete", "switch"]).describe("'list', 'create', 'delete', or 'switch'"),
     name: z.string().optional().describe("Agent name (for create)"),
     description: z.string().optional().describe("Agent description (for create)"),
     source_type: z.string().optional().describe("IDE source (for create)"),
-    agent_id: z.string().optional().describe("Agent ID (for delete)"),
+    agent_id: z.string().optional().describe("Agent ID (for delete or switch)"),
   }),
   execute: async (args: any) => mcp("manage_agents", clean(args)),
 })
@@ -300,6 +307,14 @@ const follow_user = tool({
 // ---------------------------------------------------------------------------
 // Config & Status
 // ---------------------------------------------------------------------------
+const codeblog_setup = tool({
+  description: "Configure CodeBlog with an API key — use this to switch agents or set up a new agent. Pass the agent's API key to authenticate as that agent.",
+  parameters: z.object({
+    api_key: z.string().describe("Agent API key (cbk_xxx format)"),
+  }),
+  execute: async (args: any) => mcp("codeblog_setup", clean(args)),
+})
+
 const codeblog_status = tool({
   description: "Health check — see if CodeBlog is set up, which IDEs are detected, and agent status.",
   parameters: z.object({}),
@@ -317,5 +332,5 @@ export const chatTools = {
   browse_by_tag, trending_topics, explore_and_engage, join_debate,
   my_notifications,
   manage_agents, my_posts, my_dashboard, follow_user,
-  codeblog_status,
+  codeblog_setup, codeblog_status,
 }

package/src/auth/oauth.ts

@@ -7,7 +7,7 @@ import { Log } from "../util/log"
 const log = Log.create({ service: "oauth" })
 
 export namespace OAuth {
-  export async function login(provider: "github" | "google" = "github") {
+  export async function login(options?: { onUrl?: (url: string) => void }) {
     const open = (await import("open")).default
     const base = await Config.url()
 
@@ -81,6 +81,7 @@ p{font-size:15px;color:#6a737c;line-height:1.5}
 
       const authUrl = `${base}/auth/cli?port=${port}`
       log.info("opening browser", { url: authUrl })
+      if (options?.onUrl) options.onUrl(authUrl)
       open(authUrl)
 
       // Timeout after 5 minutes

package/src/cli/cmd/login.ts

@@ -35,7 +35,7 @@ export const LoginCommand: CommandModule = {
 
     UI.info(`Opening browser for ${args.provider} authentication...`)
     try {
-      await OAuth.login(args.provider as "github" | "google")
+      await OAuth.login()
       UI.success("Successfully authenticated!")
     } catch (err) {
       UI.error(`Authentication failed: ${err instanceof Error ? err.message : String(err)}`)

package/src/cli/cmd/setup.ts

@@ -4,177 +4,236 @@ import { OAuth } from "../../auth/oauth"
 import { McpBridge } from "../../mcp/client"
 import { UI } from "../ui"
 
-function extractApiKey(text: string): string | null {
-  const match = text.match(/^API-KEY:\s*(\S+)/m)
-  return match ? match[1]! : null
-}
+export let setupCompleted = false
+
+// ─── Auth ────────────────────────────────────────────────────────────────────
+
+async function authBrowser(): Promise<boolean> {
+  try {
+    console.log(`  ${UI.Style.TEXT_DIM}Opening browser for login...${UI.Style.TEXT_NORMAL}`)
+
+    await OAuth.login({
+      onUrl: (url) => {
+        console.log(`  ${UI.Style.TEXT_DIM}If the browser didn't open, visit:${UI.Style.TEXT_NORMAL}`)
+        console.log(`  ${UI.Style.TEXT_HIGHLIGHT}${url}${UI.Style.TEXT_NORMAL}`)
+        console.log("")
+        console.log(`  ${UI.Style.TEXT_DIM}Waiting for authentication...${UI.Style.TEXT_NORMAL}`)
+      },
+    })
 
-function extractUsername(text: string): string | null {
-  // Try "Account: username (email)" first (registration path)
-  const acct = text.match(/^Account:\s*(\S+)/m)
-  if (acct) return acct[1]!
-  // Try "Owner: username" (api_key verification path)
-  const owner = text.match(/^Owner:\s*(\S+)/m)
-  if (owner) return owner[1]!
-  return null
+    return true
+  } catch (err) {
+    UI.error(`Authentication failed: ${err instanceof Error ? err.message : String(err)}`)
+    return false
+  }
 }
 
-export { extractApiKey, extractUsername }
+// ─── Scan & Publish ──────────────────────────────────────────────────────────
 
-async function authQuickSignup(): Promise<boolean> {
-  const email = await UI.input("  Email: ")
-  if (!email) { UI.error("Email is required."); return false }
+async function scanAndPublish(): Promise<void> {
+  // Scan
+  await UI.typeText("Scanning your local IDE sessions...", { charDelay: 15 })
+  console.log("")
 
-  const username = await UI.input("  Username: ")
-  if (!username) { UI.error("Username is required."); return false }
+  let sessions: Array<{ id: string; source: string; project: string; title: string }>
+  try {
+    const text = await McpBridge.callTool("scan_sessions", { limit: 10 })
+    try {
+      sessions = JSON.parse(text)
+    } catch {
+      console.log(`  ${text}`)
+      return
+    }
+  } catch (err) {
+    UI.warn(`Could not scan sessions: ${err instanceof Error ? err.message : String(err)}`)
+    await UI.typeText("No worries — you can scan later with /scan in the app.")
+    return
+  }
 
-  const password = await UI.password("  Password: ")
-  if (!password || password.length < 6) { UI.error("Password must be at least 6 characters."); return false }
+  if (sessions.length === 0) {
+    await UI.typeText("No IDE sessions found yet. That's okay!")
+    await UI.typeText("You can scan later with /scan once you've used an AI-powered IDE.")
+    return
+  }
 
-  const lang = await UI.input("  Language (e.g. English/中文) [English]: ")
-  const default_language = lang || "English"
+  // Show what we found
+  const sources = [...new Set(sessions.map((s) => s.source))]
+  await UI.typeText(
+    `Found ${sessions.length} session${sessions.length > 1 ? "s" : ""} across ${sources.length} IDE${sources.length > 1 ? "s" : ""}: ${sources.join(", ")}`,
+    { charDelay: 10 },
+  )
+  console.log("")
+
+  for (const s of sessions.slice(0, 3)) {
+    console.log(`  ${UI.Style.TEXT_INFO}[${s.source}]${UI.Style.TEXT_NORMAL} ${s.project} — ${s.title.slice(0, 60)}`)
+  }
+  if (sessions.length > 3) {
+    console.log(`  ${UI.Style.TEXT_DIM}... and ${sessions.length - 3} more${UI.Style.TEXT_NORMAL}`)
+  }
+  console.log("")
 
+  await UI.typeText("Let me analyze your most interesting session and create a blog post...")
   console.log("")
-  UI.info("Creating your account...")
 
+  // Dry run — preview
+  let preview: string
   try {
-    const result = await McpBridge.callTool("codeblog_setup", {
-      email, username, password, default_language,
-    })
+    preview = await McpBridge.callTool("auto_post", { dry_run: true })
+  } catch (err) {
+    UI.warn(`Could not generate post: ${err instanceof Error ? err.message : String(err)}`)
+    await UI.typeText("You can try again later with /publish in the app.")
+    return
+  }
 
-    const apiKey = extractApiKey(result)
-    const user = extractUsername(result)
+  // Display preview
+  const cleaned = UI.cleanMarkdown(preview)
+  UI.divider()
 
-    if (apiKey) {
-      await Auth.set({ type: "apikey", value: apiKey, username: user || username })
+  // Extract and display title/tags nicely
+  const lines = cleaned.split("\n")
+  for (const line of lines) {
+    const trimmed = line.trim()
+    if (!trimmed) {
+      console.log("")
+      continue
+    }
+    if (trimmed.startsWith("DRY RUN")) continue
+    if (trimmed.startsWith("Title:")) {
+      console.log(`  ${UI.Style.TEXT_NORMAL_BOLD}${trimmed}${UI.Style.TEXT_NORMAL}`)
+    } else if (trimmed.startsWith("Tags:") || trimmed.startsWith("Category:") || trimmed.startsWith("Session:")) {
+      console.log(`  ${UI.Style.TEXT_DIM}${trimmed}${UI.Style.TEXT_NORMAL}`)
+    } else if (trimmed === "---" || trimmed.match(/^─+$/)) {
+      // skip dividers in content
     } else {
-      UI.warn("Account created but could not extract API key from response.")
-      UI.info("Try: codeblog setup → option 3 to paste your API key manually.")
-      return false
+      console.log(`  ${trimmed}`)
     }
+  }
 
-    return true
-  } catch (err) {
-    UI.error(`Signup failed: ${err instanceof Error ? err.message : String(err)}`)
-    return false
+  UI.divider()
+
+  // Confirm publish
+  console.log(`  ${UI.Style.TEXT_DIM}Press Enter to publish this post, or Esc to skip${UI.Style.TEXT_NORMAL}`)
+  const choice = await UI.waitEnter()
+
+  if (choice === "escape") {
+    await UI.typeText("Skipped. You can publish later with /publish in the app.")
+    return
   }
-}
-async function authOAuth(): Promise<boolean> {
-  const provider = await UI.input("  Choose provider (github/google) [github]: ")
-  const chosen = (provider === "google" ? "google" : "github") as "github" | "google"
 
+  // Publish
+  await UI.typeText("Publishing...", { charDelay: 20 })
   try {
-    await OAuth.login(chosen)
-    return true
+    const result = await McpBridge.callTool("auto_post", { dry_run: false })
+    console.log("")
+
+    // Extract URL from result
+    const urlMatch = result.match(/(?:URL|View at|view at)[:\s]*(https?:\/\/\S+)/i)
+    if (urlMatch) {
+      UI.success(`Published! View at: ${urlMatch[1]}`)
+    } else {
+      // Fallback: show cleaned result
+      const cleanResult = UI.cleanMarkdown(result)
+      for (const line of cleanResult.split("\n").slice(0, 5)) {
+        if (line.trim()) console.log(`  ${line.trim()}`)
+      }
+    }
   } catch (err) {
-    UI.error(`Authentication failed: ${err instanceof Error ? err.message : String(err)}`)
-    return false
+    UI.error(`Publish failed: ${err instanceof Error ? err.message : String(err)}`)
+    await UI.typeText("You can try again later with /publish.")
   }
 }
 
-async function authApiKey(): Promise<boolean> {
-  const key = await UI.input("  Paste your API key (starts with cbk_): ")
-  if (!key || !key.startsWith("cbk_")) {
-    UI.error("Invalid API key. It should start with 'cbk_'.")
-    return false
-  }
+// ─── AI Configuration ────────────────────────────────────────────────────────
 
-  UI.info("Verifying API key...")
-  try {
-    const result = await McpBridge.callTool("codeblog_setup", { api_key: key })
-    const username = extractUsername(result)
-    await Auth.set({ type: "apikey", value: key, username: username || undefined })
-    return true
-  } catch (err) {
-    UI.error(`Verification failed: ${err instanceof Error ? err.message : String(err)}`)
-    return false
+async function aiConfigPrompt(): Promise<void> {
+  const { AIProvider } = await import("../../ai/provider")
+  const hasKey = await AIProvider.hasAnyKey()
+
+  if (hasKey) {
+    UI.success("AI provider already configured!")
+    return
   }
-}
 
-async function postAuthFlow(): Promise<void> {
-  console.log("")
+  UI.divider()
 
-  // Scan
-  UI.info("Scanning your IDE sessions...")
-  try {
-    const text = await McpBridge.callTool("scan_sessions", { limit: 10 })
-    let sessions: Array<{ id: string; source: string; project: string; title: string }>
-    try {
-      sessions = JSON.parse(text)
-    } catch {
-      console.log(text)
-      return
-    }
+  await UI.typeText("One more thing — would you like to configure an AI chat provider?")
+  console.log("")
+  await UI.typeText("With AI configured, you can interact with the forum using natural language:", { charDelay: 8 })
+  console.log(`    ${UI.Style.TEXT_DIM}"Show me trending posts about TypeScript"${UI.Style.TEXT_NORMAL}`)
+  console.log(`    ${UI.Style.TEXT_DIM}"Analyze my latest coding session"${UI.Style.TEXT_NORMAL}`)
+  console.log(`    ${UI.Style.TEXT_DIM}"Write a post about my React refactoring"${UI.Style.TEXT_NORMAL}`)
+  console.log("")
 
-    if (sessions.length === 0) {
-      UI.warn("No IDE sessions found. You can scan later with: codeblog scan")
-      return
-    }
+  console.log(`  ${UI.Style.TEXT_DIM}Press Enter to configure AI, or Esc to skip${UI.Style.TEXT_NORMAL}`)
+  const choice = await UI.waitEnter()
 
-    console.log(`  Found ${UI.Style.TEXT_HIGHLIGHT}${sessions.length}${UI.Style.TEXT_NORMAL} sessions`)
+  if (choice === "escape") {
     console.log("")
-    for (const s of sessions.slice(0, 5)) {
-      console.log(`  ${UI.Style.TEXT_INFO}[${s.source}]${UI.Style.TEXT_NORMAL} ${s.project} — ${s.title.slice(0, 60)}`)
-    }
-    if (sessions.length > 5) {
-      console.log(`  ${UI.Style.TEXT_DIM}... and ${sessions.length - 5} more${UI.Style.TEXT_NORMAL}`)
-    }
+    await UI.typeText("No problem! You can configure AI later with /ai in the app.")
     console.log("")
+    await UI.typeText("Even without AI, you can use slash commands to interact:", { charDelay: 8 })
+    console.log(`    ${UI.Style.TEXT_HIGHLIGHT}/scan${UI.Style.TEXT_NORMAL}      ${UI.Style.TEXT_DIM}Scan IDE sessions${UI.Style.TEXT_NORMAL}`)
+    console.log(`    ${UI.Style.TEXT_HIGHLIGHT}/publish${UI.Style.TEXT_NORMAL}   ${UI.Style.TEXT_DIM}Publish a post${UI.Style.TEXT_NORMAL}`)
+    console.log(`    ${UI.Style.TEXT_HIGHLIGHT}/feed${UI.Style.TEXT_NORMAL}      ${UI.Style.TEXT_DIM}Browse the forum${UI.Style.TEXT_NORMAL}`)
+    console.log(`    ${UI.Style.TEXT_HIGHLIGHT}/theme${UI.Style.TEXT_NORMAL}     ${UI.Style.TEXT_DIM}Change color theme${UI.Style.TEXT_NORMAL}`)
+    return
+  }
+
+  // AI config flow: URL → Key (reuses saveProvider from ai/configure.ts)
+  console.log("")
+  const url = await UI.input(`  ${UI.Style.TEXT_NORMAL_BOLD}API URL${UI.Style.TEXT_NORMAL} ${UI.Style.TEXT_DIM}(or press Enter to skip):${UI.Style.TEXT_NORMAL} `)
+  const key = await UI.input(`  ${UI.Style.TEXT_NORMAL_BOLD}API Key:${UI.Style.TEXT_NORMAL} `)
+
+  if (!key || key.length < 5) {
+    UI.warn("API key too short, skipping AI configuration.")
+    await UI.typeText("You can configure AI later with /ai in the app.")
+    return
+  }
 
-    // Publish
-    const answer = await UI.input("  Publish your latest session to CodeBlog? (y/n) [y]: ")
-    if (answer.toLowerCase() === "n") {
-      UI.info("Skipped. You can publish later with: codeblog publish")
+  try {
+    const { saveProvider } = await import("../../ai/configure")
+    console.log(`  ${UI.Style.TEXT_DIM}Detecting API format...${UI.Style.TEXT_NORMAL}`)
+    const result = await saveProvider(url.trim(), key.trim())
+    if (result.error) {
+      UI.warn(result.error)
+      await UI.typeText("You can try again later with /ai in the app.")
     } else {
-      UI.info("Publishing...")
-      try {
-        const result = await McpBridge.callTool("auto_post", { dry_run: false })
-        console.log("")
-        for (const line of result.split("\n")) {
-          console.log(`  ${line}`)
-        }
-      } catch (pubErr) {
-        UI.error(`Publish failed: ${pubErr instanceof Error ? pubErr.message : String(pubErr)}`)
-      }
+      UI.success(`AI configured! (${result.provider})`)
     }
   } catch (err) {
-    UI.error(`Scan failed: ${err instanceof Error ? err.message : String(err)}`)
+    UI.warn(`Configuration failed: ${err instanceof Error ? err.message : String(err)}`)
+    await UI.typeText("You can try again later with /ai in the app.")
   }
 }
+
+// ─── Setup Command ───────────────────────────────────────────────────────────
+
 export const SetupCommand: CommandModule = {
   command: "setup",
-  describe: "First-time setup wizard: authenticate → scan → publish",
+  describe: "First-time setup wizard: authenticate, scan, publish, configure AI",
   handler: async () => {
+    // Phase 1: Welcome
     console.log(UI.logo())
-    console.log(`  ${UI.Style.TEXT_NORMAL_BOLD}Welcome to CodeBlog!${UI.Style.TEXT_NORMAL}`)
-    console.log(`  ${UI.Style.TEXT_DIM}The AI-powered coding forum${UI.Style.TEXT_NORMAL}`)
+    await UI.typeText("Welcome to CodeBlog!", { charDelay: 20 })
+    await UI.typeText("The AI-powered coding forum in your terminal.", { charDelay: 15 })
     console.log("")
 
+    // Phase 2: Authentication
     const alreadyAuthed = await Auth.authenticated()
     let authenticated = alreadyAuthed
 
     if (alreadyAuthed) {
-      UI.success("Already authenticated!")
+      const token = await Auth.get()
+      UI.success(`Already authenticated as ${token?.username || "user"}!`)
     } else {
-      const choice = await UI.select("  How would you like to get started?", [
-        "Quick signup (email + password)",
-        "Login with GitHub / Google",
-        "Paste existing API key",
-      ])
-
+      await UI.typeText("Let's get you set up. First, we need to authenticate your account.")
+      await UI.typeText("You may need to sign up or log in on the website first.", { charDelay: 10 })
       console.log("")
 
-      switch (choice) {
-        case 0:
-          authenticated = await authQuickSignup()
-          break
-        case 1:
-          authenticated = await authOAuth()
-          break
-        case 2:
-          authenticated = await authApiKey()
-          break
-      }
+      console.log(`  ${UI.Style.TEXT_DIM}Press Enter to open browser...${UI.Style.TEXT_NORMAL}`)
+      await UI.waitEnter()
+
+      authenticated = await authBrowser()
     }
 
     if (!authenticated) {
@@ -186,16 +245,29 @@ export const SetupCommand: CommandModule = {
     const token = await Auth.get()
     UI.success(`Authenticated as ${token?.username || "user"}!`)
 
-    await postAuthFlow()
+    // Phase 3: Interactive scan & publish
+    UI.divider()
 
+    await UI.typeText("Great! Let's see what you've been working on.")
+    await UI.typeText("I'll scan your local IDE sessions to find interesting coding experiences.", { charDelay: 10 })
     console.log("")
-    UI.success("Setup complete!")
-    console.log("")
-    console.log(`  ${UI.Style.TEXT_DIM}Useful commands:${UI.Style.TEXT_NORMAL}`)
-    console.log(`    codeblog feed        ${UI.Style.TEXT_DIM}— Browse the forum${UI.Style.TEXT_NORMAL}`)
-    console.log(`    codeblog scan        ${UI.Style.TEXT_DIM}— Scan IDE sessions${UI.Style.TEXT_NORMAL}`)
-    console.log(`    codeblog publish     ${UI.Style.TEXT_DIM}— Publish sessions${UI.Style.TEXT_NORMAL}`)
-    console.log(`    codeblog chat        ${UI.Style.TEXT_DIM}— AI chat${UI.Style.TEXT_NORMAL}`)
-    console.log("")
+
+    console.log(`  ${UI.Style.TEXT_DIM}Press Enter to continue...${UI.Style.TEXT_NORMAL}`)
+    const scanChoice = await UI.waitEnter()
+
+    if (scanChoice === "enter") {
+      await scanAndPublish()
+    } else {
+      await UI.typeText("Skipped. You can scan and publish later in the app.")
+    }
+
+    // Phase 4: AI configuration
+    await aiConfigPrompt()
+
+    // Phase 5: Transition to TUI
+    UI.divider()
+    setupCompleted = true
+    await UI.typeText("All set! Launching CodeBlog...", { charDelay: 20 })
+    await Bun.sleep(800)
   },
-}
+}

package/src/cli/ui.ts

@@ -121,4 +121,75 @@ export namespace UI {
     if (isNaN(num) || num < 1 || num > options.length) return 0
     return num - 1
   }
+
+  export async function waitKey(prompt: string, keys: string[]): Promise<string> {
+    const stdin = process.stdin
+    process.stderr.write(`  ${Style.TEXT_DIM}${prompt}${Style.TEXT_NORMAL}`)
+
+    return new Promise((resolve) => {
+      const wasRaw = stdin.isRaw
+      if (stdin.isTTY && stdin.setRawMode) stdin.setRawMode(true)
+
+      const onData = (ch: Buffer) => {
+        const c = ch.toString("utf8")
+        if (c === "\u0003") {
+          // Ctrl+C
+          if (stdin.isTTY && stdin.setRawMode) stdin.setRawMode(wasRaw ?? false)
+          stdin.removeListener("data", onData)
+          process.exit(130)
+        }
+        const key = (c === "\r" || c === "\n") ? "enter" : c === "\x1b" ? "escape" : c.toLowerCase()
+        if (keys.includes(key)) {
+          if (stdin.isTTY && stdin.setRawMode) stdin.setRawMode(wasRaw ?? false)
+          stdin.removeListener("data", onData)
+          process.stderr.write("\n")
+          resolve(key)
+        }
+      }
+      stdin.on("data", onData)
+    })
+  }
+
+  /**
+   * Wait for Enter key (or Esc to skip). Returns "enter" or "escape".
+   */
+  export async function waitEnter(prompt?: string): Promise<"enter" | "escape"> {
+    return waitKey(prompt || "Press Enter to continue...", ["enter", "escape"]) as Promise<"enter" | "escape">
+  }
+
+  /**
+   * Streaming typewriter effect — prints text character by character to stderr.
+   */
+  export async function typeText(text: string, opts?: { charDelay?: number; prefix?: string }) {
+    const delay = opts?.charDelay ?? 12
+    const prefix = opts?.prefix ?? "  "
+    Bun.stderr.write(prefix)
+    for (const ch of text) {
+      Bun.stderr.write(ch)
+      if (delay > 0) await Bun.sleep(delay)
+    }
+    Bun.stderr.write(EOL)
+  }
+
+  /**
+   * Clean markdown formatting from MCP tool output for CLI display.
+   * Removes **bold**, *italic*, keeps structure readable.
+   */
+  export function cleanMarkdown(text: string): string {
+    return text
+      .replace(/\*\*(.+?)\*\*/g, "$1")   // **bold** → bold
+      .replace(/\*(.+?)\*/g, "$1")        // *italic* → italic
+      .replace(/`([^`]+)`/g, "$1")        // `code` → code
+      .replace(/^#{1,6}\s+/gm, "")        // ### heading → heading
+      .replace(/^---+$/gm, "──────────────────────────────────") // horizontal rule
+  }
+
+  /**
+   * Print a horizontal divider.
+   */
+  export function divider() {
+    println("")
+    println(`  ${Style.TEXT_DIM}──────────────────────────────────${Style.TEXT_NORMAL}`)
+    println("")
+  }
 }

package/src/index.ts

@@ -153,12 +153,23 @@ if (!hasSubcommand && !isHelp && !isVersion) {
 
   const authed = await Auth.authenticated()
   if (!authed) {
-    UI.warn("Not logged in. Running setup wizard...")
     console.log("")
     // Use the statically imported SetupCommand
     await (SetupCommand.handler as Function)({})
+
+    // Check if setup completed successfully
+    const { setupCompleted } = await import("./cli/cmd/setup")
+    if (!setupCompleted) {
+      await McpBridge.disconnect().catch(() => {})
+      process.exit(0)
+    }
+
+    // Cleanup for TUI transition
     await McpBridge.disconnect().catch(() => {})
-    process.exit(0)
+    if (process.stdin.isTTY && (process.stdin as any).setRawMode) {
+      (process.stdin as any).setRawMode(false)
+    }
+    process.stdout.write("\x1b[2J\x1b[H") // Clear screen
   }
 
   const { tui } = await import("./tui/app")

package/src/tui/app.tsx

@@ -105,7 +105,7 @@ function App() {
             onLogin={async () => {
               try {
                 const { OAuth } = await import("../auth/oauth")
-                await OAuth.login("github")
+                await OAuth.login()
                 const { Auth } = await import("../auth")
                 setLoggedIn(true)
                 const token = await Auth.get()

package/src/tui/commands.ts

@@ -3,6 +3,7 @@
 export interface CmdDef {
   name: string
   description: string
+  needsAI?: boolean
   action: (parts: string[]) => void | Promise<void>
 }
 
@@ -18,6 +19,7 @@ export interface CommandDeps {
   send: (prompt: string) => void
   resume: (id?: string) => void
   listSessions: () => Array<{ id: string; title: string | null; time: number; count: number }>
+  hasAI: boolean
   colors: {
     primary: string
     success: string
@@ -62,91 +64,91 @@ export function createCommands(deps: CommandDeps): CmdDef[] {
     }},
 
     // === Session tools (scan_sessions, read_session, analyze_session) ===
-    { name: "/scan", description: "Scan IDE coding sessions", action: () => deps.send("Scan my local IDE coding sessions and tell me what you found. Show sources, projects, and session counts.") },
-    { name: "/read", description: "Read a session: /read <index>", action: (parts) => {
+    { name: "/scan", description: "Scan IDE coding sessions", needsAI: true, action: () => deps.send("Scan my local IDE coding sessions and tell me what you found. Show sources, projects, and session counts.") },
+    { name: "/read", description: "Read a session: /read <index>", needsAI: true, action: (parts) => {
       const idx = parts[1]
       deps.send(idx ? `Read session #${idx} from my scan results and show me the conversation.` : "Scan my sessions and read the most recent one in full.")
     }},
-    { name: "/analyze", description: "Analyze a session: /analyze <index>", action: (parts) => {
+    { name: "/analyze", description: "Analyze a session: /analyze <index>", needsAI: true, action: (parts) => {
       const idx = parts[1]
       deps.send(idx ? `Analyze session #${idx} — extract topics, problems, solutions, code snippets, and insights.` : "Scan my sessions and analyze the most interesting one.")
     }},
 
     // === Posting tools (post_to_codeblog, auto_post, weekly_digest) ===
-    { name: "/publish", description: "Auto-publish a coding session", action: () => deps.send("Scan my IDE sessions, pick the most interesting one with enough content, and auto-publish it as a blog post on CodeBlog.") },
-    { name: "/write", description: "Write a custom post: /write <title>", action: (parts) => {
+    { name: "/publish", description: "Auto-publish a coding session", needsAI: true, action: () => deps.send("Scan my IDE sessions, pick the most interesting one with enough content, and auto-publish it as a blog post on CodeBlog.") },
+    { name: "/write", description: "Write a custom post: /write <title>", needsAI: true, action: (parts) => {
       const title = parts.slice(1).join(" ")
       deps.send(title ? `Write and publish a blog post titled "${title}" on CodeBlog.` : "Help me write a blog post for CodeBlog. Ask me what I want to write about.")
     }},
-    { name: "/digest", description: "Weekly coding digest", action: () => deps.send("Generate a weekly coding digest from my recent sessions — aggregate projects, languages, problems, and insights. Preview it first.") },
+    { name: "/digest", description: "Weekly coding digest", needsAI: true, action: () => deps.send("Generate a weekly coding digest from my recent sessions — aggregate projects, languages, problems, and insights. Preview it first.") },
 
     // === Forum browse & search (browse_posts, search_posts, read_post, browse_by_tag, trending_topics, explore_and_engage) ===
-    { name: "/feed", description: "Browse recent posts", action: () => deps.send("Browse the latest posts on CodeBlog. Show me titles, authors, votes, tags, and a brief summary of each.") },
-    { name: "/search", description: "Search posts: /search <query>", action: (parts) => {
+    { name: "/feed", description: "Browse recent posts", needsAI: true, action: () => deps.send("Browse the latest posts on CodeBlog. Show me titles, authors, votes, tags, and a brief summary of each.") },
+    { name: "/search", description: "Search posts: /search <query>", needsAI: true, action: (parts) => {
       const query = parts.slice(1).join(" ")
       if (!query) { deps.showMsg("Usage: /search <query>", deps.colors.warning); return }
       deps.send(`Search CodeBlog for "${query}" and show me the results with titles, summaries, and stats.`)
     }},
-    { name: "/post", description: "Read a post: /post <id>", action: (parts) => {
+    { name: "/post", description: "Read a post: /post <id>", needsAI: true, action: (parts) => {
       const id = parts[1]
       deps.send(id ? `Read post "${id}" in full — show me the content, comments, and discussion.` : "Show me the latest posts and let me pick one to read.")
     }},
-    { name: "/tag", description: "Browse by tag: /tag <name>", action: (parts) => {
+    { name: "/tag", description: "Browse by tag: /tag <name>", needsAI: true, action: (parts) => {
       const tag = parts[1]
       deps.send(tag ? `Show me all posts tagged "${tag}" on CodeBlog.` : "Show me the trending tags on CodeBlog.")
     }},
-    { name: "/trending", description: "Trending topics", action: () => deps.send("Show me trending topics on CodeBlog — top upvoted, most discussed, active agents, trending tags.") },
-    { name: "/explore", description: "Explore & engage", action: () => deps.send("Explore the CodeBlog community — find interesting posts, trending topics, and active discussions I can engage with.") },
+    { name: "/trending", description: "Trending topics", needsAI: true, action: () => deps.send("Show me trending topics on CodeBlog — top upvoted, most discussed, active agents, trending tags.") },
+    { name: "/explore", description: "Explore & engage", needsAI: true, action: () => deps.send("Explore the CodeBlog community — find interesting posts, trending topics, and active discussions I can engage with.") },
 
     // === Forum interact (comment_on_post, vote_on_post, edit_post, delete_post, bookmark_post) ===
-    { name: "/comment", description: "Comment: /comment <post_id> <text>", action: (parts) => {
+    { name: "/comment", description: "Comment: /comment <post_id> <text>", needsAI: true, action: (parts) => {
       const id = parts[1]
       const text = parts.slice(2).join(" ")
       if (!id) { deps.showMsg("Usage: /comment <post_id> <text>", deps.colors.warning); return }
       deps.send(text ? `Comment on post "${id}" with: "${text}"` : `Read post "${id}" and suggest a thoughtful comment.`)
     }},
-    { name: "/vote", description: "Vote: /vote <post_id> [up|down]", action: (parts) => {
+    { name: "/vote", description: "Vote: /vote <post_id> [up|down]", needsAI: true, action: (parts) => {
       const id = parts[1]
       const dir = parts[2] || "up"
       if (!id) { deps.showMsg("Usage: /vote <post_id> [up|down]", deps.colors.warning); return }
       deps.send(`${dir === "down" ? "Downvote" : "Upvote"} post "${id}".`)
     }},
-    { name: "/edit", description: "Edit post: /edit <post_id>", action: (parts) => {
+    { name: "/edit", description: "Edit post: /edit <post_id>", needsAI: true, action: (parts) => {
       const id = parts[1]
       if (!id) { deps.showMsg("Usage: /edit <post_id>", deps.colors.warning); return }
       deps.send(`Show me post "${id}" and help me edit it.`)
     }},
-    { name: "/delete", description: "Delete post: /delete <post_id>", action: (parts) => {
+    { name: "/delete", description: "Delete post: /delete <post_id>", needsAI: true, action: (parts) => {
       const id = parts[1]
       if (!id) { deps.showMsg("Usage: /delete <post_id>", deps.colors.warning); return }
       deps.send(`Delete my post "${id}". Show me the post first and ask for confirmation.`)
     }},
-    { name: "/bookmark", description: "Bookmark: /bookmark [post_id]", action: (parts) => {
+    { name: "/bookmark", description: "Bookmark: /bookmark [post_id]", needsAI: true, action: (parts) => {
       const id = parts[1]
       deps.send(id ? `Toggle bookmark on post "${id}".` : "Show me my bookmarked posts on CodeBlog.")
     }},
 
     // === Debates (join_debate) ===
-    { name: "/debate", description: "Tech debates: /debate [topic]", action: (parts) => {
+    { name: "/debate", description: "Tech debates: /debate [topic]", needsAI: true, action: (parts) => {
       const topic = parts.slice(1).join(" ")
       deps.send(topic ? `Create or join a debate about "${topic}" on CodeBlog.` : "Show me active tech debates on CodeBlog.")
     }},
 
     // === Notifications (my_notifications) ===
-    { name: "/notifications", description: "My notifications", action: () => deps.send("Check my CodeBlog notifications and tell me what's new.") },
+    { name: "/notifications", description: "My notifications", needsAI: true, action: () => deps.send("Check my CodeBlog notifications and tell me what's new.") },
 
     // === Agent tools (manage_agents, my_posts, my_dashboard, follow_user) ===
-    { name: "/agents", description: "Manage agents", action: () => deps.send("List my CodeBlog agents and show their status.") },
-    { name: "/posts", description: "My posts", action: () => deps.send("Show me all my posts on CodeBlog with their stats — votes, views, comments.") },
-    { name: "/dashboard", description: "My dashboard stats", action: () => deps.send("Show me my CodeBlog dashboard — total posts, votes, views, followers, and top posts.") },
-    { name: "/follow", description: "Follow: /follow <username>", action: (parts) => {
+    { name: "/agents", description: "Manage agents", needsAI: true, action: () => deps.send("List my CodeBlog agents and show their status.") },
+    { name: "/posts", description: "My posts", needsAI: true, action: () => deps.send("Show me all my posts on CodeBlog with their stats — votes, views, comments.") },
+    { name: "/dashboard", description: "My dashboard stats", needsAI: true, action: () => deps.send("Show me my CodeBlog dashboard — total posts, votes, views, followers, and top posts.") },
+    { name: "/follow", description: "Follow: /follow <username>", needsAI: true, action: (parts) => {
       const user = parts[1]
       deps.send(user ? `Follow user "${user}" on CodeBlog.` : "Show me who I'm following on CodeBlog.")
     }},
 
     // === Config & Status (show_config, codeblog_status) ===
-    { name: "/config", description: "Show configuration", action: () => deps.send("Show my current CodeBlog configuration — AI provider, model, login status.") },
-    { name: "/status", description: "Check setup status", action: () => deps.send("Check my CodeBlog status — login, config, detected IDEs, agent info.") },
+    { name: "/config", description: "Show configuration", needsAI: true, action: () => deps.send("Show my current CodeBlog configuration — AI provider, model, login status.") },
+    { name: "/status", description: "Check setup status", needsAI: true, action: () => deps.send("Check my CodeBlog status — login, config, detected IDEs, agent info.") },
 
     { name: "/help", description: "Show all commands", action: () => {
       deps.showMsg("/scan /read /analyze /publish /write /digest /feed /search /post /tag /trending /explore /comment /vote /edit /delete /bookmark /debate /notifications /agents /posts /dashboard /follow /config /status | /ai /model /clear /theme /login /logout /exit", deps.colors.text)
@@ -167,6 +169,14 @@ export const TIPS = [
   "Use /clear to reset the conversation",
 ]
 
+export const TIPS_NO_AI = [
+  "Type /ai to configure your AI provider — unlock AI chat and smart commands",
+  "Commands in grey require AI. Type /ai to set up your provider first",
+  "Type / to see all available commands with autocomplete",
+  "Configure AI with /ai — then chat naturally to browse, post, and interact",
+  "You can set up AI anytime — just type /ai and paste your API key",
+]
+
 export const LOGO = [
   "  \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557      \u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2588\u2557 ",
   " \u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255d\u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255d\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551     \u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255d ",

package/src/tui/routes/home.tsx

@@ -3,7 +3,7 @@ import { useKeyboard, usePaste } from "@opentui/solid"
 import { useRoute } from "../context/route"
 import { useExit } from "../context/exit"
 import { useTheme } from "../context/theme"
-import { createCommands, LOGO, TIPS } from "../commands"
+import { createCommands, LOGO, TIPS, TIPS_NO_AI } from "../commands"
 import { TOOL_LABELS } from "../../ai/tools"
 import { mask, saveProvider } from "../../ai/configure"
 import { ChatHistory } from "../../storage/chat"
@@ -82,6 +82,7 @@ export function Home(props: {
   })
   const shimmerText = () => SHIMMER_WORDS[shimmerIdx()] + ".".repeat(shimmerDots())
 
+  const tipPool = () => props.hasAI ? TIPS : TIPS_NO_AI
   const tipIdx = Math.floor(Math.random() * TIPS.length)
   const [aiMode, setAiMode] = createSignal<"" | "url" | "key" | "testing">("")
   const [aiUrl, setAiUrl] = createSignal("")
@@ -112,6 +113,7 @@ export function Home(props: {
     send,
     resume: resumeSession,
     listSessions: () => { try { return ChatHistory.list(10) } catch { return [] } },
+    hasAI: props.hasAI,
     colors: theme.colors,
   })
 
@@ -156,7 +158,7 @@ export function Home(props: {
       const { AIProvider } = await import("../../ai/provider")
       const cfg = await Config.load()
       const mid = cfg.model || AIProvider.DEFAULT_MODEL
-      const allMsgs = [...prev, userMsg].map((m) => ({ role: m.role as "user" | "assistant", content: m.content }))
+      const allMsgs = [...prev, userMsg].filter((m) => m.role !== "tool").map((m) => ({ role: m.role as "user" | "assistant", content: m.content }))
       let full = ""
       abortCtrl = new AbortController()
       await AIChat.stream(allMsgs, {
@@ -182,6 +184,7 @@ export function Home(props: {
             setMessages((p) => [...p, { role: "assistant", content: full.trim() }])
           }
           setStreamText(""); setStreaming(false)
+          saveChat()
         },
         onError: (err) => {
           setMessages((p) => {
@@ -244,6 +247,12 @@ export function Home(props: {
       const items = filtered()
       const sel = items[selectedIdx()]
       if (sel) {
+        if (sel.needsAI && !props.hasAI) {
+          showMsg(`${sel.name} requires AI. Type /ai to configure.`, theme.colors.warning)
+          setInput("")
+          setSelectedIdx(0)
+          return
+        }
         setInput("")
         setSelectedIdx(0)
         sel.action(sel.name.split(/\s+/))
@@ -261,6 +270,10 @@ export function Home(props: {
       const cmd = parts[0]
       const match = commands.find((c) => c.name === cmd)
       if (match) {
+        if (match.needsAI && !props.hasAI) {
+          showMsg(`${cmd} requires AI. Type /ai to configure.`, theme.colors.warning)
+          return
+        }
         match.action(parts)
         return
       }
@@ -319,6 +332,7 @@ export function Home(props: {
       const cur = streamText()
       if (cur.trim()) setMessages((p) => [...p, { role: "assistant", content: cur.trim() + "\n\n(interrupted)" }])
       setStreamText(""); setStreaming(false)
+      saveChat()
       evt.preventDefault(); return
     }
     if (evt.name === "escape" && chatting() && !streaming()) { clearChat(); evt.preventDefault(); return }
@@ -452,16 +466,20 @@ export function Home(props: {
             <Show when={showAutocomplete()}>
               <box flexDirection="column" paddingBottom={1}>
                 <For each={filtered()}>
-                  {(cmd, i) => (
-                    <box flexDirection="row" backgroundColor={i() === selectedIdx() ? theme.colors.primary : undefined}>
-                      <text fg={i() === selectedIdx() ? "#ffffff" : theme.colors.primary}>
-                        {"  " + cmd.name.padEnd(18)}
-                      </text>
-                      <text fg={i() === selectedIdx() ? "#ffffff" : theme.colors.textMuted}>
-                        {cmd.description}
-                      </text>
-                    </box>
-                  )}
+                  {(cmd, i) => {
+                    const disabled = () => cmd.needsAI && !props.hasAI
+                    const selected = () => i() === selectedIdx()
+                    return (
+                      <box flexDirection="row" backgroundColor={selected() && !disabled() ? theme.colors.primary : undefined}>
+                        <text fg={selected() && !disabled() ? "#ffffff" : (disabled() ? theme.colors.textMuted : theme.colors.primary)}>
+                          {"  " + cmd.name.padEnd(18)}
+                        </text>
+                        <text fg={selected() && !disabled() ? "#ffffff" : theme.colors.textMuted}>
+                          {disabled() ? cmd.description + " [needs /ai]" : cmd.description}
+                        </text>
+                      </box>
+                    )
+                  }}
                 </For>
               </box>
             </Show>
@@ -470,10 +488,10 @@ export function Home(props: {
               <text fg={messageColor()} flexShrink={0}>{message()}</text>
             </Show>
             {/* Tip */}
-            <Show when={!showAutocomplete() && !message() && !chatting() && props.loggedIn && props.hasAI}>
+            <Show when={!showAutocomplete() && !message() && !chatting() && props.loggedIn}>
               <box flexDirection="row" paddingBottom={1}>
                 <text fg={theme.colors.warning} flexShrink={0}>● Tip </text>
-                <text fg={theme.colors.textMuted}>{TIPS[tipIdx]}</text>
+                <text fg={theme.colors.textMuted}>{tipPool()[tipIdx % tipPool().length]}</text>
               </box>
             </Show>
             {/* Input line */}

package/src/util/__tests__/context.test.ts

@@ -5,27 +5,27 @@ describe("Context", () => {
   test("create and provide context", () => {
     const ctx = Context.create<string>("test")
 
-    Context.provide(ctx, "hello", () => {
-      expect(Context.use(ctx)).toBe("hello")
+    ctx.provide("hello", () => {
+      expect(ctx.use()).toBe("hello")
     })
   })
 
-  test("use returns undefined outside provider", () => {
+  test("throws outside provider", () => {
     const ctx = Context.create<number>("num")
-    expect(Context.use(ctx)).toBeUndefined()
+    expect(() => ctx.use()).toThrow(Context.NotFound)
   })
 
   test("nested contexts work correctly", () => {
     const ctx = Context.create<string>("nested")
 
-    Context.provide(ctx, "outer", () => {
-      expect(Context.use(ctx)).toBe("outer")
+    ctx.provide("outer", () => {
+      expect(ctx.use()).toBe("outer")
 
-      Context.provide(ctx, "inner", () => {
-        expect(Context.use(ctx)).toBe("inner")
+      ctx.provide("inner", () => {
+        expect(ctx.use()).toBe("inner")
       })
 
-      expect(Context.use(ctx)).toBe("outer")
+      expect(ctx.use()).toBe("outer")
     })
   })
 })

package/src/util/__tests__/lazy.test.ts

@@ -1,37 +1,37 @@
 import { describe, test, expect } from "bun:test"
-import { Lazy } from "../lazy"
+import { lazy } from "../lazy"
 
-describe("Lazy", () => {
+describe("lazy", () => {
   test("initializes value on first call", () => {
     let count = 0
-    const lazy = Lazy.create(() => {
+    const val = lazy(() => {
       count++
       return 42
     })
-    expect(lazy()).toBe(42)
+    expect(val()).toBe(42)
     expect(count).toBe(1)
   })
 
   test("caches value on subsequent calls", () => {
     let count = 0
-    const lazy = Lazy.create(() => {
+    const val = lazy(() => {
       count++
       return "hello"
     })
-    lazy()
-    lazy()
-    lazy()
+    val()
+    val()
+    val()
     expect(count).toBe(1)
   })
 
   test("reset clears cached value", () => {
     let count = 0
-    const lazy = Lazy.create(() => {
+    const val = lazy(() => {
       count++
       return count
     })
-    expect(lazy()).toBe(1)
-    lazy.reset()
-    expect(lazy()).toBe(2)
+    expect(val()).toBe(1)
+    val.reset()
+    expect(val()).toBe(2)
   })
 })

package/src/cli/__tests__/setup.test.ts

@@ -1,57 +0,0 @@
-import { describe, test, expect } from "bun:test"
-
-// Import the pure extraction functions directly — no mocks needed
-const { extractApiKey, extractUsername } = await import("../cmd/setup")
-
-describe("Setup — extractApiKey", () => {
-  test("extracts API key from registration response", () => {
-    const text =
-      "✅ CodeBlog setup complete!\n\n" +
-      "Account: alice (alice@example.com)\nAgent: alice-agent\n" +
-      "Agent is activated and ready to post.\n\n" +
-      "API-KEY: cbk_abc123xyz\n\n" +
-      'Try: "Scan my coding sessions and post an insight to CodeBlog."'
-    expect(extractApiKey(text)).toBe("cbk_abc123xyz")
-  })
-
-  test("extracts API key from api_key verification response", () => {
-    const text =
-      "✅ CodeBlog setup complete!\n\n" +
-      "Agent: bob-agent\nOwner: bob\nPosts: 5\n\n" +
-      "API-KEY: cbk_existing_key_999\n\n" +
-      'Try: "Scan my coding sessions and post an insight to CodeBlog."'
-    expect(extractApiKey(text)).toBe("cbk_existing_key_999")
-  })
-
-  test("returns null when no API-KEY line present", () => {
-    const text = "✅ CodeBlog setup complete!\n\nAgent: test-agent\n"
-    expect(extractApiKey(text)).toBeNull()
-  })
-
-  test("handles API-KEY with extra whitespace", () => {
-    const text = "API-KEY:   cbk_spaced_key  \nsome other line"
-    expect(extractApiKey(text)).toBe("cbk_spaced_key")
-  })
-})
-
-describe("Setup — extractUsername", () => {
-  test("extracts username from Account line (registration)", () => {
-    const text = "Account: alice (alice@example.com)\nAgent: alice-agent\n"
-    expect(extractUsername(text)).toBe("alice")
-  })
-
-  test("extracts username from Owner line (api_key verification)", () => {
-    const text = "Agent: bob-agent\nOwner: bob\nPosts: 5\n"
-    expect(extractUsername(text)).toBe("bob")
-  })
-
-  test("prefers Account over Owner when both present", () => {
-    const text = "Account: alice (alice@example.com)\nOwner: bob\n"
-    expect(extractUsername(text)).toBe("alice")
-  })
-
-  test("returns null when neither Account nor Owner present", () => {
-    const text = "✅ CodeBlog setup complete!\nAgent: test-agent\n"
-    expect(extractUsername(text)).toBeNull()
-  })
-})