@agent-team-foundation/first-tree-hub 0.8.2 → 0.8.3

package/dist/cli/index.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import "../logger-core-2yeIU1fc-B-__AsQO.mjs";
-import { C as setConfigValue, S as serverConfigSchema, _ as loadAgents, b as resetConfigMeta, c as saveCredentials, f as agentConfigSchema, g as initConfig, h as getConfigValue, l as DEFAULT_CONFIG_DIR, n as ensureFreshAccessToken, o as resolveServerUrl, p as clientConfigSchema, r as ensureFreshAdminToken, s as saveAgentConfig, u as DEFAULT_DATA_DIR, v as readConfigFile, y as resetConfig } from "../bootstrap-99vUYmLs.mjs";
+import { C as setConfigValue, S as serverConfigSchema, _ as loadAgents, b as resetConfigMeta, c as saveCredentials, f as agentConfigSchema, g as initConfig, h as getConfigValue, i as loadCredentials, l as DEFAULT_CONFIG_DIR, n as ensureFreshAccessToken, o as resolveServerUrl, p as clientConfigSchema, r as ensureFreshAdminToken, s as saveAgentConfig, u as DEFAULT_DATA_DIR, v as readConfigFile, y as resetConfig } from "../bootstrap-99vUYmLs.mjs";
 import "../observability-CJzDFY_G-CmvgUuzc.mjs";
-import { A as stopPostgres, C as checkServerReachable, F as SdkError, I as SessionRegistry, L as cleanWorkspaces, M as createOwner, P as FirstTreeHubSDK, R as applyClientLoggerConfig, S as checkServerHealth, T as printResults, _ as checkClientConfig, a as uninstallClientService, b as checkNodeVersion, c as promptAddAgent, d as loadOnboardState, f as onboardCheck, g as checkAgentConfigs, h as runMigrations, j as ClientRuntime, l as promptMissingFields, m as saveOnboardState, n as installClientService, o as startServer, p as onboardCreate, r as isServiceSupported, s as isInteractive, t as getClientServiceStatus, u as formatCheckReport, v as checkDatabase, w as checkWebSocket, x as checkServerConfig, y as checkDocker } from "../core-CNR-lUlr.mjs";
+import { A as stopPostgres, C as checkServerReachable, F as SdkError, I as SessionRegistry, L as cleanWorkspaces, M as createOwner, P as FirstTreeHubSDK, R as applyClientLoggerConfig, S as checkServerHealth, T as printResults, _ as checkClientConfig, a as uninstallClientService, b as checkNodeVersion, c as promptAddAgent, d as loadOnboardState, f as onboardCheck, g as checkAgentConfigs, h as runMigrations, j as ClientRuntime, l as promptMissingFields, m as saveOnboardState, n as installClientService, o as startServer, p as onboardCreate, r as isServiceSupported, s as isInteractive, t as getClientServiceStatus, u as formatCheckReport, v as checkDatabase, w as checkWebSocket, x as checkServerConfig, y as checkDocker } from "../core-CxoH-s16.mjs";
 import { n as bindFeishuUser, t as bindFeishuBot } from "../feishu-BOISS0DK.mjs";
 import { createRequire } from "node:module";
 import { Command } from "commander";
@@ -767,6 +767,90 @@ function registerAgentCommands(program) {
 }
 //#endregion
 //#region src/commands/connect.ts
+/** Decode a JWT payload without signature verification. For UI purposes only. */
+function decodeJwtPayload(token) {
+	try {
+		const parts = token.split(".");
+		if (parts.length !== 3 || !parts[1]) return null;
+		const raw = Buffer.from(parts[1], "base64url").toString();
+		const obj = JSON.parse(raw);
+		if (typeof obj !== "object" || obj === null) return null;
+		return obj;
+	} catch {
+		return null;
+	}
+}
+/**
+* Detect if the current home already holds a setup for a *different* account,
+* and give the operator a chance to back out before we overwrite credentials.
+*
+* Why this gate exists: running `client connect` implicitly overwrites
+* `~/.first-tree-hub/config/credentials.json`. Without this prompt, someone
+* onboarding a second account on their own machine silently logs themselves
+* out of the first account — they'd only notice when their "main" agents
+* appeared offline later. We treat single-account-per-machine as the product
+* default; the `FIRST_TREE_HUB_HOME` env var remains the advanced escape
+* hatch for power users who want parallel setups.
+*
+* The caller passes the *new* memberId directly so this gate can run BEFORE
+* auth. That matters for the `--token` path: connect tokens are single-use;
+* if we auth first and the user picks Cancel, the token is burned even
+* though nothing changed on disk. Decoding the connect token locally lets
+* us return early without spending it.
+*
+* Behavior:
+*   - No existing credentials → proceed silently (first-time install).
+*   - Existing credentials, same memberId → proceed silently (reconnect /
+*     token refresh — common + safe).
+*   - Existing credentials, memberId indeterminate → prompt with
+*     "unknown account" label so the user can decide.
+*   - Existing credentials, different memberId → prompt [Replace / Cancel].
+*     Cancel prints the isolation guide and returns "cancel".
+*/
+async function promptReplaceOrCancel(newMemberId, newServerUrl) {
+	const existing = loadCredentials();
+	if (!existing) return "proceed";
+	const existingPayload = decodeJwtPayload(existing.accessToken);
+	const existingMemberId = typeof existingPayload?.memberId === "string" ? existingPayload.memberId : null;
+	if (existingMemberId && existingMemberId === newMemberId) return "proceed";
+	const existingMember = existingMemberId ? `member ${existingMemberId.slice(0, 8)}` : "unknown account";
+	const existingOrg = typeof existingPayload?.organizationId === "string" ? existingPayload.organizationId : null;
+	const serviceStatus = getClientServiceStatus();
+	const serviceLine = serviceStatus.state === "active" ? `running (${serviceStatus.detail ?? "live"})` : serviceStatus.state === "inactive" ? `installed but not running${serviceStatus.detail ? ` — ${serviceStatus.detail}` : ""}` : "not installed";
+	process.stderr.write("\n");
+	process.stderr.write("  ⚠️  This computer is already connected to the Hub under another account.\n\n");
+	process.stderr.write(`       Existing account:  ${existingMember}\n`);
+	if (existingOrg) process.stderr.write(`       Organization:      ${existingOrg.slice(0, 8)}\n`);
+	process.stderr.write(`       Server:            ${existing.serverUrl}\n`);
+	process.stderr.write(`       Background service: ${serviceLine}\n\n`);
+	process.stderr.write("     Replacing only affects THIS computer. Your agents, messages, and\n");
+	process.stderr.write("     settings on the Hub itself are untouched.\n\n");
+	if (await select({
+		message: "How would you like to continue?",
+		choices: [{
+			name: "Replace — log out the other account and set up this one",
+			value: "replace"
+		}, {
+			name: "Cancel  — keep the existing setup on this computer",
+			value: "cancel"
+		}]
+	}) === "cancel") {
+		printIsolationGuide(newServerUrl);
+		return "cancel";
+	}
+	return "proceed";
+}
+function printIsolationGuide(newServerUrl) {
+	process.stderr.write("\n  Cancelled. The existing account on this computer is untouched.\n\n");
+	process.stderr.write("  To run this new account alongside it (advanced — no background service):\n\n");
+	process.stderr.write("    export FIRST_TREE_HUB_HOME=\"$HOME/.first-tree-hub-<label>\"\n");
+	process.stderr.write(`    first-tree-hub client connect ${newServerUrl} --token <token>\n`);
+	process.stderr.write("    first-tree-hub client start\n\n");
+	process.stderr.write("  Notes:\n");
+	process.stderr.write("    - Run the commands in a FRESH terminal (the isolated home must be set first).\n");
+	process.stderr.write("    - In isolated mode the client stays online only while that terminal runs.\n");
+	process.stderr.write("    - The main account's background service is not affected.\n\n");
+}
 /**
 * Authenticate via connect token — exchange for full JWT credentials.
 */
@@ -803,10 +887,27 @@ function registerConnectCommand(parent) {
 	parent.command("connect <server-url>").description("Connect to a Hub server — configure, authenticate, and install the background service").option("--token <token>", "Connect token (from Hub web console) — skips interactive login").option("--no-service", "Skip background service install (runs inline until Ctrl+C)").action(async (serverUrl, options) => {
 		try {
 			const url = serverUrl.replace(/\/+$/, "");
+			let preAuthDecided = false;
+			if (options.token) {
+				const connectPayload = decodeJwtPayload(options.token);
+				const newMemberId = typeof connectPayload?.memberId === "string" ? connectPayload.memberId : null;
+				if (newMemberId !== null) {
+					if (await promptReplaceOrCancel(newMemberId, url) === "cancel") return;
+					preAuthDecided = true;
+				}
+			}
+			const tokens = options.token ? await authenticateWithToken(url, options.token) : await authenticateInteractive(url);
+			if (!preAuthDecided) {
+				const newPayload = decodeJwtPayload(tokens.accessToken);
+				const newMemberId = typeof newPayload?.memberId === "string" ? newPayload.memberId : null;
+				if (newMemberId !== null) {
+					if (await promptReplaceOrCancel(newMemberId, url) === "cancel") return;
+				}
+			}
 			setConfigValue(join(DEFAULT_CONFIG_DIR, "client.yaml"), "server.url", url);
 			process.stderr.write(`\n  \u2713 Server configured: ${url}\n`);
 			saveCredentials({
-				...options.token ? await authenticateWithToken(url, options.token) : await authenticateInteractive(url),
+				...tokens,
 				serverUrl: url
 			});
 			process.stderr.write("  ✓ Authenticated\n");

package/dist/{core-CNR-lUlr.mjs → core-CxoH-s16.mjs}

@@ -12,7 +12,7 @@ import { homedir, hostname, platform, userInfo } from "node:os";
 import { EventEmitter } from "node:events";
 import WebSocket from "ws";
 import { query } from "@anthropic-ai/claude-agent-sdk";
-import { execFileSync, execSync, spawn } from "node:child_process";
+import { execFileSync, execSync, spawn, spawnSync } from "node:child_process";
 import bcrypt from "bcrypt";
 import { and, asc, count, desc, eq, gt, inArray, isNotNull, isNull, lt, ne, or, sql } from "drizzle-orm";
 import { drizzle } from "drizzle-orm/postgres-js";
@@ -11796,6 +11796,32 @@ function resolveWebDist() {
 }
 //#endregion
 //#region src/core/service-install.ts
+/**
+* Run a subprocess capturing stderr so failures surface a meaningful error
+* instead of Node's opaque "Command failed". Used for launchctl/systemctl —
+* anywhere the stderr message is diagnostically crucial.
+*/
+function runCapture(program, args, timeoutMs) {
+	const res = spawnSync(program, args, {
+		encoding: "utf-8",
+		timeout: timeoutMs,
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		]
+	});
+	if (res.status === 0) return { ok: true };
+	return {
+		ok: false,
+		stderr: (res.stderr ?? "").trim(),
+		code: res.status
+	};
+}
+function sleepSync(ms) {
+	const shared = new Int32Array(new SharedArrayBuffer(4));
+	Atomics.wait(shared, 0, 0, ms);
+}
 const LAUNCHD_LABEL = "dev.first-tree-hub.client";
 const SYSTEMD_UNIT = "first-tree-hub-client.service";
 const LOG_DIR = join(DEFAULT_HOME_DIR$1, "logs");
@@ -11903,30 +11929,56 @@ function launchctlDomainTarget() {
 }
 function launchdState() {
 	if (!existsSync(launchdPlistPath())) return { state: "not-installed" };
-	try {
-		const out = execFileSync("launchctl", ["print", `${launchctlDomainTarget()}/${LAUNCHD_LABEL}`], {
-			encoding: "utf-8",
-			timeout: 5e3
-		});
-		const stateLine = out.split(/\r?\n/).find((l) => l.trim().startsWith("state ="));
-		const pidLine = out.split(/\r?\n/).find((l) => l.trim().startsWith("pid ="));
-		if (stateLine?.includes("running")) {
-			const pid = pidLine?.split("=")[1]?.trim();
-			return {
-				state: "active",
-				detail: pid ? `pid ${pid}` : "running"
-			};
-		}
-		return {
-			state: "inactive",
-			detail: stateLine?.trim() ?? "loaded"
-		};
-	} catch {
+	const res = spawnSync("launchctl", ["print", `${launchctlDomainTarget()}/${LAUNCHD_LABEL}`], {
+		encoding: "utf-8",
+		timeout: 5e3,
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		]
+	});
+	if (res.status !== 0) return {
+		state: "inactive",
+		detail: "plist present but not loaded"
+	};
+	const out = res.stdout ?? "";
+	const stateLine = out.split(/\r?\n/).find((l) => l.trim().startsWith("state ="));
+	const pidLine = out.split(/\r?\n/).find((l) => l.trim().startsWith("pid ="));
+	if (stateLine?.includes("running")) {
+		const pid = pidLine?.split("=")[1]?.trim();
 		return {
-			state: "inactive",
-			detail: "plist present but not loaded"
+			state: "active",
+			detail: pid ? `pid ${pid}` : "running"
 		};
 	}
+	return {
+		state: "inactive",
+		detail: stateLine?.trim() ?? "loaded"
+	};
+}
+/**
+* Poll `launchctl print` until the label disappears, confirming launchd has
+* finished the async eviction kicked off by `bootout`. Required because
+* `bootout` returns before the actual unload completes when the service has
+* active WebSocket connections — a follow-up `bootstrap` against a still-
+* registered label fails with `Bootstrap failed: 5: Input/output error`.
+*/
+function waitForLabelEvicted(target, label, timeoutMs) {
+	const deadline = Date.now() + timeoutMs;
+	while (Date.now() < deadline) {
+		if (spawnSync("launchctl", ["print", `${target}/${label}`], {
+			encoding: "utf-8",
+			timeout: 2e3,
+			stdio: [
+				"ignore",
+				"ignore",
+				"pipe"
+			]
+		}).status !== 0) return true;
+		sleepSync(200);
+	}
+	return false;
 }
 function installLaunchd() {
 	const invocation = resolveCliInvocation();
@@ -11935,24 +11987,28 @@ function installLaunchd() {
 	mkdirSync(dirname(plistPath), { recursive: true });
 	writeFileSync(plistPath, renderPlist(invocation), { mode: 420 });
 	const target = launchctlDomainTarget();
-	try {
-		execFileSync("launchctl", ["bootout", `${target}/${LAUNCHD_LABEL}`], {
-			stdio: "ignore",
-			timeout: 5e3
-		});
-	} catch {}
-	execFileSync("launchctl", [
-		"bootstrap",
-		target,
-		plistPath
-	], {
-		stdio: "ignore",
-		timeout: 5e3
-	});
-	execFileSync("launchctl", ["enable", `${target}/${LAUNCHD_LABEL}`], {
-		stdio: "ignore",
-		timeout: 5e3
-	});
+	const bootoutRes = runCapture("launchctl", ["bootout", `${target}/${LAUNCHD_LABEL}`], 15e3);
+	if (!bootoutRes.ok) {
+		if (!/not find|no such|not loaded/i.test(bootoutRes.stderr)) process.stderr.write(`    warning: launchctl bootout: ${bootoutRes.stderr || `exit ${bootoutRes.code ?? "unknown"}`}\n`);
+	}
+	waitForLabelEvicted(target, LAUNCHD_LABEL, 1e4);
+	let lastBootstrapErr = null;
+	for (let attempt = 1; attempt <= 2; attempt++) {
+		const res = runCapture("launchctl", [
+			"bootstrap",
+			target,
+			plistPath
+		], 1e4);
+		if (res.ok) {
+			lastBootstrapErr = null;
+			break;
+		}
+		lastBootstrapErr = res;
+		if (attempt < 2) sleepSync(1e3);
+	}
+	if (lastBootstrapErr) throw new Error(`launchctl bootstrap failed: ${lastBootstrapErr.stderr || `exit ${lastBootstrapErr.code ?? "unknown"}`}\n    Command: launchctl bootstrap ${target} ${plistPath}\n    Recovery: \`launchctl bootout ${target}/${LAUNCHD_LABEL}\` then \`first-tree-hub service install\`.`);
+	const enableRes = runCapture("launchctl", ["enable", `${target}/${LAUNCHD_LABEL}`], 5e3);
+	if (!enableRes.ok) process.stderr.write(`    warning: launchctl enable: ${enableRes.stderr || `exit ${enableRes.code ?? "unknown"}`}\n`);
 	const { state, detail } = launchdState();
 	return {
 		platform: "launchd",
@@ -11965,13 +12021,8 @@ function installLaunchd() {
 }
 function uninstallLaunchd() {
 	const plistPath = launchdPlistPath();
-	const target = launchctlDomainTarget();
-	try {
-		execFileSync("launchctl", ["bootout", `${target}/${LAUNCHD_LABEL}`], {
-			stdio: "ignore",
-			timeout: 5e3
-		});
-	} catch {}
+	const res = runCapture("launchctl", ["bootout", `${launchctlDomainTarget()}/${LAUNCHD_LABEL}`], 15e3);
+	if (!res.ok && !/not find|no such|not loaded/i.test(res.stderr)) process.stderr.write(`    warning: bootout during uninstall: ${res.stderr || `exit ${res.code ?? "unknown"}`}\n`);
 	if (existsSync(plistPath)) rmSync(plistPath);
 	return {
 		platform: "launchd",
@@ -12009,29 +12060,28 @@ function shellQuote(value) {
 }
 function systemdState() {
 	if (!existsSync(systemdUnitPath())) return { state: "not-installed" };
-	try {
-		const out = execFileSync("systemctl", [
-			"--user",
-			"is-active",
-			SYSTEMD_UNIT
-		], {
-			encoding: "utf-8",
-			timeout: 5e3
-		}).trim();
-		if (out === "active") return {
-			state: "active",
-			detail: "running"
-		};
-		return {
-			state: "inactive",
-			detail: out
-		};
-	} catch (err) {
-		return {
-			state: "inactive",
-			detail: (typeof err.stdout === "string" ? (err.stdout ?? "").trim() : "") || "unit present but not active"
-		};
-	}
+	const res = spawnSync("systemctl", [
+		"--user",
+		"is-active",
+		SYSTEMD_UNIT
+	], {
+		encoding: "utf-8",
+		timeout: 5e3,
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		]
+	});
+	const out = (res.stdout ?? "").trim();
+	if (res.status === 0 && out === "active") return {
+		state: "active",
+		detail: "running"
+	};
+	return {
+		state: "inactive",
+		detail: out || "unit present but not active"
+	};
 }
 function installSystemd() {
 	const invocation = resolveCliInvocation();
@@ -12039,19 +12089,15 @@ function installSystemd() {
 	const unitPath = systemdUnitPath();
 	mkdirSync(dirname(unitPath), { recursive: true });
 	writeFileSync(unitPath, renderSystemdUnit(invocation), { mode: 420 });
-	execFileSync("systemctl", ["--user", "daemon-reload"], {
-		stdio: "ignore",
-		timeout: 5e3
-	});
-	execFileSync("systemctl", [
+	const reloadRes = runCapture("systemctl", ["--user", "daemon-reload"], 5e3);
+	if (!reloadRes.ok) throw new Error(`systemctl --user daemon-reload failed: ${reloadRes.stderr || `exit ${reloadRes.code ?? "unknown"}`}`);
+	const enableRes = runCapture("systemctl", [
 		"--user",
 		"enable",
 		"--now",
 		SYSTEMD_UNIT
-	], {
-		stdio: "ignore",
-		timeout: 1e4
-	});
+	], 1e4);
+	if (!enableRes.ok) throw new Error(`systemctl --user enable --now ${SYSTEMD_UNIT} failed: ${enableRes.stderr || `exit ${enableRes.code ?? "unknown"}`}\n    Recovery: \`systemctl --user stop ${SYSTEMD_UNIT}\` then \`first-tree-hub service install\`.`);
 	const { state, detail } = systemdState();
 	return {
 		platform: "systemd",
@@ -12064,24 +12110,16 @@ function installSystemd() {
 }
 function uninstallSystemd() {
 	const unitPath = systemdUnitPath();
-	try {
-		execFileSync("systemctl", [
-			"--user",
-			"disable",
-			"--now",
-			SYSTEMD_UNIT
-		], {
-			stdio: "ignore",
-			timeout: 1e4
-		});
-	} catch {}
+	const disableRes = runCapture("systemctl", [
+		"--user",
+		"disable",
+		"--now",
+		SYSTEMD_UNIT
+	], 1e4);
+	if (!disableRes.ok && !/not found|no such|not loaded/i.test(disableRes.stderr)) process.stderr.write(`    warning: systemctl disable during uninstall: ${disableRes.stderr || `exit ${disableRes.code ?? "unknown"}`}\n`);
 	if (existsSync(unitPath)) rmSync(unitPath);
-	try {
-		execFileSync("systemctl", ["--user", "daemon-reload"], {
-			stdio: "ignore",
-			timeout: 5e3
-		});
-	} catch {}
+	const reloadRes = runCapture("systemctl", ["--user", "daemon-reload"], 5e3);
+	if (!reloadRes.ok) process.stderr.write(`    warning: systemctl daemon-reload during uninstall: ${reloadRes.stderr || `exit ${reloadRes.code ?? "unknown"}`}\n`);
 	return {
 		platform: "systemd",
 		label: SYSTEMD_UNIT,

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import "./logger-core-2yeIU1fc-B-__AsQO.mjs";
 import { a as resolveAccessToken, n as ensureFreshAccessToken, o as resolveServerUrl, r as ensureFreshAdminToken } from "./bootstrap-99vUYmLs.mjs";
 import "./observability-CJzDFY_G-CmvgUuzc.mjs";
-import { A as stopPostgres, C as checkServerReachable, D as status, E as blank, F as SdkError, M as createOwner, N as hasUser, O as ensurePostgres, P as FirstTreeHubSDK, S as checkServerHealth, T as printResults, _ as checkClientConfig, a as uninstallClientService, b as checkNodeVersion, c as promptAddAgent, f as onboardCheck, g as checkAgentConfigs, h as runMigrations, i as resolveCliInvocation, j as ClientRuntime, k as isDockerAvailable, l as promptMissingFields, n as installClientService, o as startServer, p as onboardCreate, r as isServiceSupported, s as isInteractive, t as getClientServiceStatus, u as formatCheckReport, v as checkDatabase, w as checkWebSocket, x as checkServerConfig, y as checkDocker } from "./core-CNR-lUlr.mjs";
+import { A as stopPostgres, C as checkServerReachable, D as status, E as blank, F as SdkError, M as createOwner, N as hasUser, O as ensurePostgres, P as FirstTreeHubSDK, S as checkServerHealth, T as printResults, _ as checkClientConfig, a as uninstallClientService, b as checkNodeVersion, c as promptAddAgent, f as onboardCheck, g as checkAgentConfigs, h as runMigrations, i as resolveCliInvocation, j as ClientRuntime, k as isDockerAvailable, l as promptMissingFields, n as installClientService, o as startServer, p as onboardCreate, r as isServiceSupported, s as isInteractive, t as getClientServiceStatus, u as formatCheckReport, v as checkDatabase, w as checkWebSocket, x as checkServerConfig, y as checkDocker } from "./core-CxoH-s16.mjs";
 import { n as bindFeishuUser, t as bindFeishuBot } from "./feishu-BOISS0DK.mjs";
 export { ClientRuntime, FirstTreeHubSDK, SdkError, bindFeishuBot, bindFeishuUser, blank, checkAgentConfigs, checkClientConfig, checkDatabase, checkDocker, checkNodeVersion, checkServerConfig, checkServerHealth, checkServerReachable, checkWebSocket, createOwner, ensureFreshAccessToken, ensureFreshAdminToken, ensurePostgres, formatCheckReport, getClientServiceStatus, hasUser, installClientService, isDockerAvailable, isInteractive, isServiceSupported, onboardCheck, onboardCreate, printResults, promptAddAgent, promptMissingFields, resolveAccessToken, resolveCliInvocation, resolveServerUrl, runMigrations, startServer, status, stopPostgres, uninstallClientService };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-team-foundation/first-tree-hub",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "type": "module",
   "description": "First Tree Hub — unified CLI for server, client, and agent management",
   "exports": {