@agent-team-foundation/first-tree-hub 0.3.5 → 0.5.0

package/dist/{bootstrap-mhkpeOEc.mjs → bootstrap-BU_7B03u.mjs}

@@ -450,27 +450,23 @@ const serverConfigSchema = defineConfig({
 			secret: true
 		})
 	},
-	contextTree: {
+	contextTree: optional({
 		repo: field(z.string(), {
 			env: "FIRST_TREE_HUB_CONTEXT_TREE_REPO",
 			prompt: { message: "Context Tree repo URL (e.g. https://github.com/org/first-tree):" }
 		}),
-		branch: field(z.string().default("main")),
-		syncInterval: field(z.number().default(60))
-	},
+		branch: field(z.string().default("main"))
+	}),
 	github: {
-		token: field(z.string(), {
+		token: field(z.string().optional(), {
 			env: "FIRST_TREE_HUB_GITHUB_TOKEN",
-			secret: true,
-			prompt: {
-				message: "GitHub token (create at https://github.com/settings/tokens → repo scope):",
-				type: "password"
-			}
+			secret: true
 		}),
 		webhookSecret: field(z.string().optional(), {
 			env: "FIRST_TREE_HUB_GITHUB_WEBHOOK_SECRET",
 			secret: true
-		})
+		}),
+		allowedOrg: field(z.string().optional(), { env: "FIRST_TREE_HUB_GITHUB_ALLOWED_ORG" })
 	},
 	cors: optional({ origin: field(z.string(), { env: "FIRST_TREE_HUB_CORS_ORIGIN" }) }),
 	rateLimit: optional({
@@ -536,23 +532,29 @@ function resolveServerUrl(flagValue) {
 /**
 * Bootstrap a token for an agent using GitHub identity.
 */
-async function bootstrapToken(serverUrl, agentId, options = {}) {
+async function bootstrapToken(serverUrl, agentName, options = {}) {
 	const githubToken = getGitHubToken();
-	const res = await fetch(`${serverUrl}/api/v1/bootstrap/${encodeURIComponent(agentId)}/token`, {
+	const body = { name: "bootstrap" };
+	if (options.type) body.type = options.type;
+	if (options.displayName) body.displayName = options.displayName;
+	if (options.delegateMention) body.delegateMention = options.delegateMention;
+	if (options.profile) body.profile = options.profile;
+	if (options.metadata) body.metadata = options.metadata;
+	const res = await fetch(`${serverUrl}/api/v1/bootstrap/${encodeURIComponent(agentName)}/token`, {
 		method: "POST",
 		headers: {
 			"X-GitHub-Token": githubToken,
 			"Content-Type": "application/json"
 		},
-		body: JSON.stringify({ name: "bootstrap" })
+		body: JSON.stringify(body)
 	});
 	if (!res.ok) {
 		const msg = (await res.json().catch(() => ({}))).error ?? `HTTP ${res.status}`;
-		throw new Error(`Bootstrap failed for "${agentId}": ${msg}`);
+		throw new Error(`Bootstrap failed for "${agentName}": ${msg}`);
 	}
 	const data = await res.json();
 	if (options.saveTo === "agent" || !options.saveTo) {
-		const configDir = join(DEFAULT_CONFIG_DIR, "agents", agentId);
+		const configDir = join(DEFAULT_CONFIG_DIR, "agents", agentName);
 		const configPath = `${configDir}/agent.yaml`;
 		mkdirSync(configDir, {
 			recursive: true,
@@ -578,9 +580,9 @@ function resolveAgentToken() {
 /**
 * Check if an agent exists and is synced.
 */
-async function checkBootstrapStatus(serverUrl, agentId) {
+async function checkBootstrapStatus(serverUrl, agentName) {
 	const githubToken = getGitHubToken();
-	const res = await fetch(`${serverUrl}/api/v1/bootstrap/${encodeURIComponent(agentId)}/status`, { headers: { "X-GitHub-Token": githubToken } });
+	const res = await fetch(`${serverUrl}/api/v1/bootstrap/${encodeURIComponent(agentName)}/status`, { headers: { "X-GitHub-Token": githubToken } });
 	if (!res.ok) {
 		const body = await res.json().catch(() => ({}));
 		throw new Error(body.error ?? `HTTP ${res.status}`);

package/dist/cli/index.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { A as ClientRuntime, C as checkWebSocket, F as SessionRegistry, I as cleanWorkspaces, N as FirstTreeHubSDK, P as SdkError, S as checkServerReachable, _ as checkDocker, a as formatCheckReport, b as checkServerConfig, c as onboardContinue, d as runMigrations, f as checkAgentConfigs, g as checkDatabase, h as checkContextTreeRepo, i as promptMissingFields, j as createAdminUser, k as stopPostgres, l as onboardCreate, m as checkClientConfig, n as isInteractive, o as loadOnboardState, p as checkAgentTokens, r as promptAddAgent, s as onboardCheck, t as startServer, u as saveOnboardState, v as checkGitHubToken, w as printResults, x as checkServerHealth, y as checkNodeVersion } from "../core-CHL_dgzu.mjs";
-import { S as setConfigValue, _ as readConfigFile, c as DEFAULT_CONFIG_DIR, d as agentConfigSchema, f as clientConfigSchema, g as loadAgents, h as initConfig, l as DEFAULT_DATA_DIR, m as getConfigValue, o as resolveAgentToken, s as resolveServerUrl, t as bootstrapToken, u as DEFAULT_HOME_DIR, v as resetConfig, x as serverConfigSchema, y as resetConfigMeta } from "../bootstrap-mhkpeOEc.mjs";
+import { A as createAdminUser, C as printResults, F as cleanWorkspaces, M as FirstTreeHubSDK, N as SdkError, O as stopPostgres, P as SessionRegistry, S as checkWebSocket, _ as checkGitHubToken, a as formatCheckReport, b as checkServerHealth, c as onboardCreate, d as checkAgentConfigs, f as checkAgentTokens, g as checkDocker, h as checkDatabase, i as promptMissingFields, k as ClientRuntime, l as saveOnboardState, m as checkContextTreeRepo, n as isInteractive, o as loadOnboardState, p as checkClientConfig, r as promptAddAgent, s as onboardCheck, t as startServer, u as runMigrations, v as checkNodeVersion, x as checkServerReachable, y as checkServerConfig } from "../core-jjk1xFW_.mjs";
+import { S as setConfigValue, _ as readConfigFile, c as DEFAULT_CONFIG_DIR, d as agentConfigSchema, f as clientConfigSchema, g as loadAgents, h as initConfig, l as DEFAULT_DATA_DIR, m as getConfigValue, o as resolveAgentToken, s as resolveServerUrl, t as bootstrapToken, u as DEFAULT_HOME_DIR, v as resetConfig, x as serverConfigSchema, y as resetConfigMeta } from "../bootstrap-BU_7B03u.mjs";
 import { n as bindFeishuUser, t as bindFeishuBot } from "../feishu-Y4m2zFc3.mjs";
 import { createRequire } from "node:module";
 import { Command } from "commander";
@@ -165,10 +165,10 @@ function registerAgentCommands(program) {
 		}
 		process.stderr.write(`  ${totalRemoved} workspace(s) cleaned.\n`);
 	});
-	agent.command("token").description("Agent token management").command("bootstrap <agentId>").description("Bootstrap a token using GitHub identity (requires gh CLI)").option("--save-to <target>", "Save token to: \"agent\" (default) or a file path", "agent").option("--server <url>", "Hub server URL").action(async (agentId, options) => {
+	agent.command("token").description("Agent token management").command("bootstrap <agentName>").description("Bootstrap a token using GitHub identity (requires gh CLI)").option("--save-to <target>", "Save token to: \"agent\" (default) or a file path", "agent").option("--server <url>", "Hub server URL").action(async (agentName, options) => {
 		try {
-			const result = await bootstrapToken(resolveServerUrl(options.server), agentId, { saveTo: options.saveTo });
-			if (options.saveTo === "agent") process.stderr.write(`Token saved to ${DEFAULT_HOME_DIR}/config/agents/${agentId}/agent.yaml\n`);
+			const result = await bootstrapToken(resolveServerUrl(options.server), agentName, { saveTo: options.saveTo });
+			if (options.saveTo === "agent") process.stderr.write(`Token saved to ${DEFAULT_HOME_DIR}/config/agents/${agentName}/agent.yaml\n`);
 			else process.stderr.write(`Token saved to ${options.saveTo}\n`);
 			success({
 				agentId: result.agentId,
@@ -455,14 +455,31 @@ function isSecretField(schema, dotPath) {
 //#endregion
 //#region src/commands/onboard.ts
 async function promptMissing(args) {
+	if (!args.server) try {
+		const { resolveServerUrl } = await import("../bootstrap-BU_7B03u.mjs").then((n) => n.n);
+		resolveServerUrl();
+	} catch {
+		args.server = await input({ message: "Hub server URL:" });
+		saveOnboardState(args);
+	}
+	const { resolveServerUrl } = await import("../bootstrap-BU_7B03u.mjs").then((n) => n.n);
+	const serverUrl = resolveServerUrl(args.server).replace(/\/+$/, "");
+	try {
+		const res = await fetch(`${serverUrl}/api/v1/bootstrap/config`);
+		if (res.ok) {
+			if (!(await res.json()).allowedOrg) throw new Error("Server does not have FIRST_TREE_HUB_GITHUB_ALLOWED_ORG configured.\n  Ask the server admin to set this before onboarding.");
+		}
+	} catch (err) {
+		if (err instanceof Error && err.message.includes("FIRST_TREE_HUB_GITHUB_ALLOWED_ORG")) throw err;
+	}
 	let ghUsername = null;
 	try {
-		const { getGitHubUsername } = await import("../bootstrap-mhkpeOEc.mjs").then((n) => n.n);
+		const { getGitHubUsername } = await import("../bootstrap-BU_7B03u.mjs").then((n) => n.n);
 		ghUsername = getGitHubUsername();
 	} catch {}
 	if (!args.id) {
 		args.id = await input({
-			message: "Member ID (directory name):",
+			message: "Agent ID:",
 			default: ghUsername ?? void 0
 		});
 		saveOnboardState(args);
@@ -488,12 +505,18 @@ async function promptMissing(args) {
 		saveOnboardState(args);
 	}
 	if (!args.role) {
-		args.role = await input({ message: "Role:" });
-		saveOnboardState(args);
+		const role = await input({ message: "Role (optional, Enter to skip):" });
+		if (role) {
+			args.role = role;
+			saveOnboardState(args);
+		}
 	}
 	if (!args.domains) {
-		args.domains = await input({ message: "Domains (comma-separated):" });
-		saveOnboardState(args);
+		const domains = await input({ message: "Domains (comma-separated, optional, Enter to skip):" });
+		if (domains) {
+			args.domains = domains;
+			saveOnboardState(args);
+		}
 	}
 	if (!args.displayName) {
 		const name = await input({ message: `Display name (Enter to use "${args.id}"):` });
@@ -514,13 +537,6 @@ async function promptMissing(args) {
 			saveOnboardState(args);
 		}
 	}
-	if (!args.server) try {
-		const { resolveServerUrl } = await import("../bootstrap-mhkpeOEc.mjs").then((n) => n.n);
-		resolveServerUrl();
-	} catch {
-		args.server = await input({ message: "Hub server URL:" });
-		saveOnboardState(args);
-	}
 	if (!args.feishuBotAppId && (args.type !== "human" || args.assistant)) {
 		if (await confirm({
 			message: "Bind Feishu bot?",
@@ -533,7 +549,7 @@ async function promptMissing(args) {
 	}
 }
 function registerOnboardCommand(program) {
-	program.command("onboard").description("Onboard a new member to First Tree Hub (end-to-end)").option("--id <id>", "Member ID (directory name)").option("--type <type>", "Agent type: human | personal_assistant | autonomous_agent").option("--display-name <name>", "Display name (defaults to id)").option("--role <role>", "Role description").option("--domains <domains>", "Comma-separated domains").option("--assistant <id>", "Also create a personal_assistant with this ID").option("--delegate-mention <id>", "Set delegate_mention field").option("--server <url>", "Hub server URL").option("--feishu-bot-app-id <id>", "Feishu bot App ID").option("--feishu-bot-app-secret <secret>", "Feishu bot App Secret").option("--check", "Dry-run: show readiness checklist without executing").option("--continue", "Resume after PR merge (Phase 2)").action(async (options) => {
+	program.command("onboard").description("Onboard a new agent to First Tree Hub").option("--id <id>", "Agent ID").option("--type <type>", "Agent type: human | personal_assistant | autonomous_agent").option("--display-name <name>", "Display name (defaults to id)").option("--role <role>", "Role description").option("--domains <domains>", "Comma-separated domains").option("--profile <text>", "Agent profile (markdown)").option("--assistant <id>", "Also create a personal_assistant with this ID").option("--delegate-mention <id>", "Set delegate_mention field").option("--server <url>", "Hub server URL").option("--feishu-bot-app-id <id>", "Feishu bot App ID").option("--feishu-bot-app-secret <secret>", "Feishu bot App Secret").option("--check", "Dry-run: show readiness checklist without executing").action(async (options) => {
 		try {
 			const args = {
 				...loadOnboardState() ?? {},
@@ -542,20 +558,16 @@ function registerOnboardCommand(program) {
 				...options.displayName && { displayName: options.displayName },
 				...options.role && { role: options.role },
 				...options.domains && { domains: options.domains },
+				...options.profile && { profile: options.profile },
 				...options.assistant && { assistant: options.assistant },
 				...options.delegateMention && { delegateMention: options.delegateMention },
 				...options.server && { server: options.server },
 				...options.feishuBotAppId && { feishuBotAppId: options.feishuBotAppId },
 				...options.feishuBotAppSecret && { feishuBotAppSecret: options.feishuBotAppSecret },
-				check: options.check,
-				continue: options.continue
+				check: options.check
 			};
 			if (!args.feishuBotAppId && process.env.FEISHU_APP_ID) args.feishuBotAppId = process.env.FEISHU_APP_ID;
 			if (!args.feishuBotAppSecret && process.env.FEISHU_APP_SECRET) args.feishuBotAppSecret = process.env.FEISHU_APP_SECRET;
-			if (args.continue) {
-				await onboardContinue(args);
-				return;
-			}
 			if (args.check) {
 				const items = await onboardCheck(args);
 				const report = formatCheckReport(items);
@@ -570,18 +582,11 @@ function registerOnboardCommand(program) {
 				process.stderr.write(`\nOnboard Check: ${args.id ?? "(no id)"}\n\n${report}\n\n`);
 				fail("MISSING_PARAMS", "Required parameters are missing. See checklist above.");
 			}
-			const result = await onboardCreate(args);
-			process.stderr.write(`\nPR created: ${result.prUrl}\n`);
-			process.stderr.write("Review and merge the PR, then run:\n");
-			process.stderr.write("  first-tree-hub onboard --continue\n\n");
-			success({
-				phase: "create",
-				prUrl: result.prUrl
-			});
+			await onboardCreate(args);
 		} catch (error) {
 			const msg = error instanceof Error ? error.message : String(error);
 			if (isInteractive()) {
-				process.stderr.write(`\n❌ ${msg}\n\n`);
+				process.stderr.write(`\n\u274C ${msg}\n\n`);
 				process.exit(1);
 			}
 			fail("ONBOARD_ERROR", msg);