@wlfi-agent/cli 1.4.18 → 1.4.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wlfi-agent/cli",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "description": "Single-entrypoint WLFI agent CLI",
   "type": "module",
   "bin": {

package/src/lib/admin-reset.ts

@@ -165,6 +165,24 @@ const sudoSession = createSudoSession({
     ),
 });
 
+function isSudoWrappedInvocation(): boolean {
+  return (
+    typeof process.geteuid === 'function' &&
+    process.geteuid() === 0 &&
+    typeof process.env.SUDO_UID === 'string' &&
+    process.env.SUDO_UID.trim().length > 0
+  );
+}
+
+function assertNotInvokedViaSudo(commandName: string): void {
+  if (!isSudoWrappedInvocation()) {
+    return;
+  }
+  throw new Error(
+    `run \`wlfi-agent ${commandName}\` as your normal macOS user, not with sudo; the CLI prompts for sudo internally and running it as root can target the wrong local WLFI home`,
+  );
+}
+
 function createProgress(message: string, enabled = true): ProgressHandle {
   if (!enabled) {
     return {
@@ -226,6 +244,51 @@ function print(payload: unknown, asJson: boolean | undefined): void {
   /* c8 ignore stop */
 }
 
+async function managedPathExists(targetPath: string): Promise<boolean> {
+  const result = await sudoSession.run(['/bin/test', '-e', targetPath]);
+  if (result.code === 0) {
+    return true;
+  }
+  if (
+    result.code === 1 &&
+    !/password is required|try again|authentication failed|sorry/iu.test(result.stderr)
+  ) {
+    return false;
+  }
+  throw new Error(
+    result.stderr.trim() ||
+      result.stdout.trim() ||
+      `failed to inspect managed path '${targetPath}' (exit code ${result.code})`,
+  );
+}
+
+async function assertManagedUninstallArtifactsRemoved(targetPaths: string[]): Promise<void> {
+  const remaining: string[] = [];
+  for (const targetPath of targetPaths) {
+    if (await managedPathExists(targetPath)) {
+      remaining.push(targetPath);
+    }
+  }
+  if (remaining.length > 0) {
+    throw new Error(
+      `admin uninstall left managed root-owned files behind: ${remaining.join(', ')}`,
+    );
+  }
+}
+
+function assertLocalUninstallArtifactsRemoved(result: CleanupLocalAdminUninstallStateResult): void {
+  const remaining: string[] = [];
+  if (result.config.existed && fs.existsSync(result.config.path)) {
+    remaining.push(result.config.path);
+  }
+  if (result.wlfiHome.existed && fs.existsSync(result.wlfiHome.path)) {
+    remaining.push(result.wlfiHome.path);
+  }
+  if (remaining.length > 0) {
+    throw new Error(`admin uninstall left local WLFI files behind: ${remaining.join(', ')}`);
+  }
+}
+
 function printResetSummary(result: {
   daemon: {
     label: string;
@@ -456,6 +519,7 @@ async function confirmReset(options: AdminResetOptions): Promise<void> {
 }
 
 async function runAdminReset(options: AdminResetOptions): Promise<void> {
+  assertNotInvokedViaSudo('admin reset');
   await confirmReset(options);
   const showProgress = !options.json;
   const keychainAccount = os.userInfo().username;
@@ -607,6 +671,7 @@ function printUninstallSummary(result: {
 }
 
 async function runAdminUninstall(options: AdminUninstallOptions): Promise<void> {
+  assertNotInvokedViaSudo('admin uninstall');
   await confirmUninstall(options);
   const showProgress = !options.json;
   const keychainAccount = os.userInfo().username;
@@ -670,11 +735,29 @@ async function runAdminUninstall(options: AdminUninstallOptions): Promise<void>
         || `failed to delete managed root-owned files (exit code ${deleteRootArtifactsResult.code})`,
     );
   }
-  rootProgress.succeed('Managed root-owned files removed');
+  try {
+    await assertManagedUninstallArtifactsRemoved([
+      DEFAULT_LAUNCH_DAEMON_PLIST,
+      DEFAULT_MANAGED_ROOT_DIR,
+      DEFAULT_MANAGED_STATE_DIR,
+      DEFAULT_MANAGED_LOG_DIR,
+    ]);
+    rootProgress.succeed('Managed root-owned files removed');
+  } catch (error) {
+    rootProgress.fail();
+    throw error;
+  }
 
   const localProgress = createProgress('Removing local WLFI files and credentials', showProgress);
-  const local = cleanupLocalAdminUninstallState();
-  localProgress.succeed('Local WLFI files and credentials removed');
+  let local: CleanupLocalAdminUninstallStateResult;
+  try {
+    local = cleanupLocalAdminUninstallState();
+    assertLocalUninstallArtifactsRemoved(local);
+    localProgress.succeed('Local WLFI files and credentials removed');
+  } catch (error) {
+    localProgress.fail();
+    throw error;
+  }
 
   const result = {
     command: 'uninstall',

package/src/lib/admin-setup.ts

@@ -393,6 +393,35 @@ function resolveStateFile(): string {
   return path.resolve(DEFAULT_MANAGED_STATE_FILE);
 }
 
+function resolveDefaultActiveChainForFreshSetup(
+  config: WlfiConfig,
+): { chainId: number; chainName: string; rpcUrl?: string } | null {
+  try {
+    const profile = resolveCliNetworkProfile('bsc', config);
+    return {
+      chainId: profile.chainId,
+      chainName: profile.key?.trim() || profile.name.trim().toLowerCase() || 'bsc',
+      ...(profile.rpcUrl?.trim() ? { rpcUrl: profile.rpcUrl.trim() } : {}),
+    };
+  } catch {
+    return null;
+  }
+}
+
+function shouldSeedDefaultActiveChain(
+  options: Pick<AdminSetupOptions, 'network' | 'rpcUrl' | 'chainName'>,
+  config: WlfiConfig,
+): boolean {
+  return (
+    !options.network &&
+    !options.rpcUrl &&
+    !options.chainName &&
+    config.chainId === undefined &&
+    !config.chainName?.trim() &&
+    !config.rpcUrl?.trim()
+  );
+}
+
 export function createAdminSetupPlan(
   options: AdminSetupOptions,
   deps: CreateAdminSetupPlanDeps = {},
@@ -1293,6 +1322,9 @@ async function runAdminSetup(options: AdminSetupOptions): Promise<void> {
   const config = readConfig();
   const daemonSocket = resolveDaemonSocket(options.daemonSocket);
   const stateFile = resolveStateFile();
+  const defaultActiveChain = shouldSeedDefaultActiveChain(options, config)
+    ? resolveDefaultActiveChainForFreshSetup(config)
+    : null;
   const reusableWallet = options.reuseExistingWallet
     ? resolveReusableWalletSetupTarget(config)
     : null;
@@ -1588,6 +1620,13 @@ async function runAdminSetup(options: AdminSetupOptions): Promise<void> {
   const persistedConfig = writeConfig({
     daemonSocket,
     stateFile,
+    ...(defaultActiveChain
+      ? {
+          chainId: defaultActiveChain.chainId,
+          chainName: defaultActiveChain.chainName,
+          ...(defaultActiveChain.rpcUrl ? { rpcUrl: defaultActiveChain.rpcUrl } : {}),
+        }
+      : {}),
   });
 
   printCliPayload(