jobarbiter 0.3.1 → 0.3.3

package/src/lib/onboard.ts

@@ -11,7 +11,15 @@
 import * as readline from "node:readline";
 import { loadConfig, saveConfig, getConfigPath, type Config } from "./config.js";
 import { apiUnauthenticated, api, ApiError } from "./api.js";
-import { detectAgents, installObservers, type DetectedAgent } from "./observe.js";
+import { installObservers } from "./observe.js";
+import {
+	detectAllTools,
+	getInstalledTools,
+	getToolsNeedingObserver,
+	formatToolDisplay,
+	type DetectedTool,
+	type ToolCategory,
+} from "./detect-tools.js";
 
 // ── ANSI Colors ────────────────────────────────────────────────────────
 
@@ -131,13 +139,44 @@ interface OnboardState {
 export async function runOnboardWizard(opts: { force?: boolean; baseUrl?: string }): Promise<void> {
 	const baseUrl = opts.baseUrl || "https://jobarbiter-api-production.up.railway.app";
 	
-	// Check for existing config
+	// Check for existing config — resume if onboarding incomplete
 	const existingConfig = loadConfig();
 	if (existingConfig && !opts.force) {
-		console.log(`\n${sym.warning}  ${c.warning("You already have a JobArbiter account configured.")}`);
-		console.log(`\n   Run ${c.highlight("jobarbiter status")} to check your account.`);
-		console.log(`   Run ${c.highlight("jobarbiter onboard --force")} to start fresh.\n`);
-		process.exit(0);
+		if (existingConfig.onboardingComplete) {
+			console.log(`\n${sym.check}  ${c.success("You're already onboarded!")}`);
+			console.log(`\n   Run ${c.highlight("jobarbiter status")} to check your account.`);
+			console.log(`   Run ${c.highlight("jobarbiter onboard --force")} to start fresh.\n`);
+			process.exit(0);
+		}
+		// Onboarding incomplete — resume
+		const resumeStep = (existingConfig.onboardingStep ?? 1) + 1;
+		console.log(`\n${sym.rocket}  ${c.bold("Resuming onboarding")} from step ${resumeStep}/6\n`);
+		console.log(c.dim(`   Account: ${existingConfig.userType} | API key configured`));
+		console.log(c.dim(`   Run ${c.highlight("jobarbiter onboard --force")} to start over.\n`));
+		
+		const prompt = new Prompt();
+		const state: Partial<OnboardState> = {
+			baseUrl,
+			apiKey: existingConfig.apiKey,
+			userType: existingConfig.userType as "worker" | "employer",
+			userId: "",
+			email: "",
+		};
+		try {
+			if (existingConfig.userType === "worker" || existingConfig.userType === "seeker") {
+				await runWorkerFlow(prompt, state as OnboardState, resumeStep);
+			} else {
+				await runEmployerFlow(prompt, state as OnboardState);
+			}
+			prompt.close();
+		} catch (err) {
+			prompt.close();
+			if (err instanceof Error) {
+				console.log(`\n${sym.cross} ${c.error(err.message)}`);
+			}
+			process.exit(1);
+		}
+		return;
 	}
 
 	const prompt = new Prompt();
@@ -155,11 +194,13 @@ export async function runOnboardWizard(opts: { force?: boolean; baseUrl?: string
 		state.apiKey = apiKey;
 		state.userId = userId;
 
-		// Save config immediately after verification
+		// Save config immediately after verification (with step progress)
 		saveConfig({
 			apiKey,
 			baseUrl,
 			userType,
+			onboardingStep: 1,
+			onboardingComplete: false,
 		});
 
 		if (userType === "worker") {
@@ -216,7 +257,9 @@ async function handleEmailVerification(
 	baseUrl: string,
 	userType: "worker" | "employer"
 ): Promise<{ email: string; apiKey: string; userId: string }> {
-	const totalSteps = userType === "worker" ? 5 : 6;
+	// Workers: 1) Account, 2) Tool Detection, 3) Domains, 4) GitHub, 5) LinkedIn, 6) Done
+	// Employers: 1) Account, 2) (skip verification), 3) Company, 4) Domain, 5) What You Need, 6) Done
+	const totalSteps = 6;
 	
 	console.log(`\n${sym.email} ${c.bold(`Step 1/${totalSteps} — Create Your Account`)}\n`);
 
@@ -296,189 +339,232 @@ async function handleEmailVerification(
 
 // ── Worker Flow ────────────────────────────────────────────────────────
 
-async function runWorkerFlow(prompt: Prompt, state: OnboardState): Promise<void> {
+async function runWorkerFlow(prompt: Prompt, state: OnboardState, startStep = 2): Promise<void> {
 	const config: Config = {
 		apiKey: state.apiKey,
 		baseUrl: state.baseUrl,
 		userType: "worker",
 	};
 
-	// Step 2: Profile Setup (tools + domains)
-	console.log(`${sym.tools} ${c.bold("Step 2/6 — Your AI Stack")}\n`);
-	
-	console.log(`What AI tools do you use? ${c.dim("(comma-separated)")}`);
-	console.log(c.dim("Examples: Claude Code, Cursor, OpenClaw, ChatGPT, Copilot, Midjourney\n"));
-	const toolsInput = await prompt.question(`${sym.arrow} `);
-	const tools = toolsInput.split(",").map(s => s.trim()).filter(Boolean);
-	state.tools = tools;
-
-	console.log(`\nWhat domains do you work in? ${c.dim("(comma-separated)")}`);
-	console.log(c.dim("Examples: full-stack dev, data engineering, trading, content creation\n"));
-	const domainsInput = await prompt.question(`${sym.arrow} `);
-	const domains = domainsInput.split(",").map(s => s.trim()).filter(Boolean);
-	state.domains = domains;
-
-	// Create/update profile
-	console.log(c.dim("\nSaving profile..."));
+	const saveProgress = (step: number) => {
+		saveConfig({ ...config, onboardingStep: step });
+	};
 
-	try {
-		await api(config, "POST", "/v1/profile", {
-			domains,
-			tools: {
-				primary: tools,
-			},
-		});
-		console.log(`${sym.check} Profile saved\n`);
-	} catch (err) {
-		console.log(`${sym.warning} ${c.warning("Could not save profile details — you can update later with 'jobarbiter profile create'")}\n`);
+	// Step 2: Auto-detect AI Tools
+	if (startStep <= 2) {
+		const detectedToolsResult = await runToolDetectionStep(prompt, config);
+		state.tools = detectedToolsResult.tools;
+		saveProgress(2);
 	}
 
-	// Step 3: Install Coding Agent Observers
-	await runObserverStep(prompt, state, 3, 6);
+	// Step 3: Domains
+	if (startStep <= 3) {
+		console.log(`${sym.target} ${c.bold("Step 3/6 — Your Domains")}\n`);
+		console.log(`What domains do you work in? ${c.dim("(comma-separated)")}`);
+		console.log(c.dim("Examples: full-stack dev, data engineering, trading, content creation\n"));
+		const domainsInput = await prompt.question(`${sym.arrow} `);
+		const domains = domainsInput.split(",").map(s => s.trim()).filter(Boolean);
+		state.domains = domains;
 
-	// Step 4: Connect GitHub (optional)
-	console.log(`${sym.link} ${c.bold("Step 4/6 — Connect GitHub")} ${c.dim("(optional)")}\n`);
-	console.log(`Connecting your GitHub lets us analyze your AI-assisted work patterns.`);
-	console.log(`This significantly boosts your proficiency score.\n`);
+		// Create/update profile
+		console.log(c.dim("\nSaving profile..."));
 
-	const githubUsername = await prompt.question(`GitHub username ${c.dim("(press Enter to skip)")}: `);
-	
-	if (githubUsername) {
-		console.log(c.dim("\nConnecting GitHub..."));
 		try {
-			await api(config, "POST", "/v1/attestations/git/connect", {
-				provider: "github",
-				username: githubUsername,
+			await api(config, "POST", "/v1/profile", {
+				domains,
+				tools: {
+					primary: state.tools,
+				},
 			});
-			console.log(`${sym.check} GitHub connected: ${c.highlight(githubUsername)}\n`);
-			state.githubUsername = githubUsername;
+			console.log(`${sym.check} Profile saved\n`);
 		} catch (err) {
-			console.log(`${sym.warning} ${c.warning("Could not connect GitHub — you can try later with 'jobarbiter git connect'")}\n`);
+			console.log(`${sym.warning} ${c.warning("Could not save profile details — you can update later with 'jobarbiter profile create'")}\n`);
 		}
-	} else {
-		console.log(`${c.dim("Skipped — you can connect later with 'jobarbiter git connect'")}\n`);
+		saveProgress(3);
+	}
+
+	// Step 4: Connect GitHub (optional)
+	if (startStep <= 4) {
+		console.log(`${sym.link} ${c.bold("Step 4/6 — Connect GitHub")} ${c.dim("(optional)")}\n`);
+		console.log(`Connecting your GitHub lets us analyze your AI-assisted work patterns.`);
+		console.log(`This significantly boosts your proficiency score.\n`);
+
+		const githubUsername = await prompt.question(`GitHub username ${c.dim("(press Enter to skip)")}: `);
+		
+		if (githubUsername) {
+			console.log(c.dim("\nConnecting GitHub..."));
+			try {
+				await api(config, "POST", "/v1/attestations/git/connect", {
+					provider: "github",
+					username: githubUsername,
+				});
+				console.log(`${sym.check} GitHub connected: ${c.highlight(githubUsername)}\n`);
+				state.githubUsername = githubUsername;
+			} catch (err) {
+				console.log(`${sym.warning} ${c.warning("Could not connect GitHub — you can try later with 'jobarbiter git connect'")}\n`);
+			}
+		} else {
+			console.log(`${c.dim("Skipped — you can connect later with 'jobarbiter git connect'")}\n`);
+		}
+		saveProgress(4);
 	}
 
 	// Step 5: Connect LinkedIn (optional)
-	console.log(`${sym.link} ${c.bold("Step 5/6 — Connect LinkedIn")} ${c.dim("(optional)")}\n`);
-	console.log(`Your LinkedIn profile strengthens identity verification.`);
-	console.log(c.dim("We never post on your behalf or access your connections.\n"));
+	if (startStep <= 5) {
+		console.log(`${sym.link} ${c.bold("Step 5/6 — Connect LinkedIn")} ${c.dim("(optional)")}\n`);
+		console.log(`Your LinkedIn profile strengthens identity verification.`);
+		console.log(c.dim("We never post on your behalf or access your connections.\n"));
 
-	const linkedinUrl = await prompt.question(`LinkedIn URL ${c.dim("(press Enter to skip)")}: `);
-	
-	if (linkedinUrl) {
-		console.log(c.dim("\nSubmitting for verification..."));
-		try {
-			await api(config, "POST", "/v1/verification/linkedin", {
-				linkedinUrl: linkedinUrl.trim(),
-			});
-			console.log(`${sym.check} LinkedIn submitted for verification\n`);
-		} catch (err) {
-			console.log(`${sym.warning} ${c.warning("Could not submit LinkedIn — you can try later with 'jobarbiter identity linkedin <url>'")}\n`);
+		const linkedinUrl = await prompt.question(`LinkedIn URL ${c.dim("(press Enter to skip)")}: `);
+		
+		if (linkedinUrl) {
+			console.log(c.dim("\nSubmitting for verification..."));
+			try {
+				await api(config, "POST", "/v1/verification/linkedin", {
+					linkedinUrl: linkedinUrl.trim(),
+				});
+				console.log(`${sym.check} LinkedIn submitted for verification\n`);
+			} catch (err) {
+				console.log(`${sym.warning} ${c.warning("Could not submit LinkedIn — you can try later with 'jobarbiter identity linkedin <url>'")}\n`);
+			}
+		} else {
+			console.log(`${c.dim("Skipped — you can connect later with 'jobarbiter identity linkedin <url>'")}\n`);
 		}
-	} else {
-		console.log(`${c.dim("Skipped — you can connect later with 'jobarbiter identity linkedin <url>'")}\n`);
+		saveProgress(5);
 	}
 
 	// Step 6: Done!
+	saveConfig({ ...config, onboardingComplete: true, onboardingStep: 6 });
 	showWorkerCompletion(state);
 }
 
-// ── Observer Installation Step ─────────────────────────────────────────
+// ── Tool Detection Step ────────────────────────────────────────────────
 
-async function runObserverStep(
+async function runToolDetectionStep(
 	prompt: Prompt,
-	state: OnboardState,
-	stepNum: number,
-	totalSteps: number,
-): Promise<void> {
-	console.log(`🔍 ${c.bold(`Step ${stepNum}/${totalSteps} — Coding Agent Observers`)}\n`);
-	console.log(c.dim("Scanning for coding agents...\n"));
-
-	const agents = detectAgents();
-	const detected = agents.filter((a) => a.installed);
-	const notDetected = agents.filter((a) => !a.installed);
-
-	// Show results
-	if (detected.length === 0) {
-		console.log(`  ${c.dim("No coding agents detected on this system.")}\n`);
-		console.log(c.dim("  You can install observers later with 'jobarbiter observe install'.\n"));
-		return;
+	config: Config,
+): Promise<{ tools: string[] }> {
+	console.log(`🔍 ${c.bold("Step 2/6 — Detecting AI Tools")}\n`);
+	console.log(c.dim("  Scanning your machine...\n"));
+
+	const allTools = detectAllTools();
+	const installed = allTools.filter((t) => t.installed);
+	const notInstalled = allTools.filter((t) => !t.installed && t.category === "coding-agent");
+
+	// Group by category
+	const codingAgents = installed.filter((t) => t.category === "coding-agent");
+	const chatTools = installed.filter((t) => t.category === "chat");
+	const orchestration = installed.filter((t) => t.category === "orchestration");
+	const apiProviders = installed.filter((t) => t.category === "api-provider");
+
+	// Display found tools
+	if (installed.length === 0) {
+		console.log(`  ${c.dim("No AI tools detected on this system.")}\n`);
+		console.log(c.dim("  You can add tools later with 'jobarbiter observe install'.\n"));
+		return { tools: [] };
 	}
 
-	console.log(`  Found on your system:`);
-	for (const agent of detected) {
-		if (agent.hookInstalled) {
-			console.log(`    ${sym.check} ${agent.name}  ${c.dim("(observer already installed)")}`);
+	console.log(`  ${c.bold("Found:")}`);
+
+	// Show coding agents with observer status
+	for (const tool of codingAgents) {
+		const display = formatToolDisplay(tool);
+		if (tool.observerAvailable) {
+			if (tool.observerActive) {
+				console.log(`    ${sym.check} ${display} ${c.dim("(observer active)")}`);
+			} else {
+				console.log(`    ${sym.check} ${display} ${c.success("(observer available)")}`);
+			}
 		} else {
-			console.log(`    ${c.success("✓")} ${agent.name}`);
+			console.log(`    ${sym.check} ${display} ${c.dim("(detected)")}`);
 		}
 	}
-	for (const agent of notDetected) {
-		console.log(`    ${c.dim("⬚")} ${agent.name}  ${c.dim("(not found)")}`);
+
+	// Show other tools
+	for (const tool of chatTools) {
+		console.log(`    ${sym.check} ${formatToolDisplay(tool)} ${c.dim("(detected)")}`);
+	}
+	for (const tool of orchestration) {
+		console.log(`    ${sym.check} ${formatToolDisplay(tool)} ${c.dim("(detected)")}`);
+	}
+	for (const tool of apiProviders) {
+		console.log(`    ${sym.check} ${tool.name} ${c.dim("configured")}`);
 	}
 
-	// Filter to agents that need installation
-	const needsInstall = detected.filter((a) => !a.hookInstalled);
-	
-	if (needsInstall.length === 0) {
-		console.log(`\n  ${c.dim("All detected agents already have observers installed.")}\n`);
-		return;
+	// Show not-detected coding agents
+	if (notInstalled.length > 0) {
+		console.log(`\n  ${c.dim("Not detected (install to track):")}`);
+		for (const tool of notInstalled.slice(0, 5)) {
+			console.log(`    ${c.dim("⬚")} ${tool.name}`);
+		}
+		if (notInstalled.length > 5) {
+			console.log(`    ${c.dim(`... and ${notInstalled.length - 5} more`)}`);
+		}
 	}
 
-	console.log(`\n  JobArbiter observes your coding sessions to build your`);
-	console.log(`  proficiency profile. ${c.bold("No code or prompts leave your machine")} —`);
-	console.log(`  only aggregate scores (tool usage, session counts, token volume).\n`);
-	console.log(c.dim(`  Data stored locally: ~/.config/jobarbiter/observer/observations.json`));
-	console.log(c.dim(`  Review anytime: jobarbiter observe status\n`));
+	// Collect tool names for profile
+	const toolNames = installed.map((t) => t.name);
 
-	const installAll = await prompt.confirm(
-		`  Install observers for all ${needsInstall.length} detected agent${needsInstall.length > 1 ? "s" : ""}?`,
-	);
+	// Observer installation for coding agents
+	const needsObserver = codingAgents.filter((t) => t.observerAvailable && !t.observerActive);
 
-	let toInstall: string[];
+	if (needsObserver.length > 0) {
+		console.log(`\n  ${c.bold("Observers")}`);
+		console.log(`  JobArbiter observes your coding sessions to build your`);
+		console.log(`  proficiency profile. ${c.bold("No code or prompts leave your machine")} —`);
+		console.log(`  only aggregate scores (tool usage, session counts, token volume).\n`);
+		console.log(c.dim(`  Data stored locally: ~/.config/jobarbiter/observer/observations.json`));
+		console.log(c.dim(`  Review anytime: jobarbiter observe status\n`));
 
-	if (installAll) {
-		toInstall = needsInstall.map((a) => a.id);
-	} else {
-		// Let user select individually
-		console.log(`\n  Select which agents to observe:\n`);
-		const selections: Record<string, boolean> = {};
-		
-		for (const agent of needsInstall) {
-			selections[agent.id] = await prompt.confirm(`    ${agent.name}?`, true);
-		}
-
-		toInstall = Object.entries(selections)
-			.filter(([, v]) => v)
-			.map(([k]) => k);
+		const observerNames = needsObserver.map((t) => t.name).join(", ");
+		const installAll = await prompt.confirm(
+			`  Install observers for detected tools? (${observerNames})`,
+		);
 
-		if (toInstall.length === 0) {
-			console.log(`\n  ${c.dim("No observers installed. You can add them later with 'jobarbiter observe install'.")}\n`);
-			return;
-		}
-	}
+		if (installAll) {
+			const toInstall = needsObserver.map((t) => t.id);
+			console.log(c.dim("\n  Installing observers..."));
+			const result = installObservers(toInstall);
 
-	// Install
-	console.log(c.dim("\n  Installing observers..."));
-	const result = installObservers(toInstall);
+			for (const name of result.installed) {
+				console.log(`    ${sym.check} ${name}`);
+			}
+			for (const name of result.skipped) {
+				console.log(`    ${c.dim("—")} ${name} ${c.dim("(already installed)")}`);
+			}
+			for (const { agent, error: errMsg } of result.errors) {
+				console.log(`    ${sym.cross} ${agent}: ${c.error(errMsg)}`);
+			}
 
-	for (const name of result.installed) {
-		console.log(`    ${sym.check} ${name}`);
-	}
-	for (const name of result.skipped) {
-		console.log(`    ${c.dim("—")} ${name} ${c.dim("(already installed)")}`);
-	}
-	for (const { agent, error: errMsg } of result.errors) {
-		console.log(`    ${sym.cross} ${agent}: ${c.error(errMsg)}`);
+			if (result.installed.length > 0) {
+				console.log(`\n  ${sym.check} ${c.success(`${result.installed.length} observer${result.installed.length > 1 ? "s" : ""} installed!`)}`);
+				console.log(c.dim(`  Your proficiency profile will start building automatically.\n`));
+			}
+		} else {
+			console.log(c.dim("\n  Skipped — you can install observers later with 'jobarbiter observe install'.\n"));
+		}
+	} else if (codingAgents.length > 0) {
+		const hasActiveObservers = codingAgents.some((t) => t.observerActive);
+		if (hasActiveObservers) {
+			console.log(`\n  ${c.dim("All detected agents already have observers installed.")}\n`);
+		} else {
+			console.log();
+		}
 	}
 
-	if (result.installed.length > 0) {
-		console.log(`\n  ${sym.check} ${c.success(`${result.installed.length} observer${result.installed.length > 1 ? "s" : ""} installed!`)}`);
-		console.log(c.dim(`  Your proficiency profile will start building automatically.\n`));
+	// "Did we miss anything?" prompt
+	console.log(`  ${c.dim("Did we miss anything?")}`);
+	const additionalTools = await prompt.question(`  Other AI tools you use ${c.dim("(comma-separated, or press Enter)")}: `);
+	
+	if (additionalTools.trim()) {
+		const additional = additionalTools.split(",").map((s) => s.trim()).filter(Boolean);
+		toolNames.push(...additional);
+		console.log(`  ${sym.check} Added: ${additional.join(", ")}\n`);
 	} else {
 		console.log();
 	}
+
+	return { tools: toolNames };
 }
 
 function showWorkerCompletion(state: OnboardState): void {