@dmsdc-ai/aterm 0.1.3 → 0.1.4

package/bin/aterm.js

@@ -3,7 +3,11 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
-import { resolveAigentryConfig } from '../lib/aigentry.js';
+import {
+  ensureUserLayout,
+  getUserAtermConfigPath,
+  resolveAigentryConfig,
+} from '../lib/aigentry.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -11,6 +15,72 @@ const packageRoot = path.resolve(__dirname, '..');
 const appRoot = path.join(packageRoot, 'dist', 'aterm.app');
 const executable = path.join(appRoot, 'Contents', 'MacOS', 'aterm');
 const frameworksDir = path.join(appRoot, 'Contents', 'Frameworks');
+const packageJson = JSON.parse(
+  fs.readFileSync(path.join(packageRoot, 'package.json'), 'utf8'),
+);
+
+function printVersionAndExit() {
+  console.log(packageJson.version);
+  process.exit(0);
+}
+
+function readUserSetupState() {
+  const configPath = getUserAtermConfigPath();
+  if (!fs.existsSync(configPath)) {
+    return {
+      configPath,
+      setupCompleted: false,
+    };
+  }
+
+  try {
+    const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+    return {
+      configPath,
+      setupCompleted: config.setupCompleted === true,
+    };
+  } catch (error) {
+    console.warn(`[aterm] invalid user config, rerunning setup: ${error.message}`);
+    return {
+      configPath,
+      setupCompleted: false,
+    };
+  }
+}
+
+async function maybeRunFirstRunWizard() {
+  ensureUserLayout({ version: packageJson.version });
+  const setupState = readUserSetupState();
+  if (setupState.setupCompleted) {
+    return;
+  }
+
+  let wizardModule;
+  try {
+    wizardModule = await import('../scripts/tui-installer.js');
+  } catch (error) {
+    console.warn(`[aterm] setup wizard unavailable, launching with defaults (${error.message})`);
+    return;
+  }
+
+  if (!wizardModule.shouldRunFirstRunWizard()) {
+    return;
+  }
+
+  const context = wizardModule.buildFirstRunWizardContext(packageJson.version, process.cwd());
+  const wizardResult = await wizardModule.runFirstRunWizard(context);
+  if (!wizardResult) {
+    process.exit(0);
+  }
+
+  await wizardModule.completeFirstRunWizard(context, wizardResult);
+}
+
+if (process.argv.includes('--version') || process.argv.includes('-v')) {
+  printVersionAndExit();
+}
+
+await maybeRunFirstRunWizard();
 const resolvedConfig = resolveAigentryConfig({ cwd: process.cwd() });
 
 if (!fs.existsSync(executable)) {

package/lib/aigentry.js

@@ -246,6 +246,10 @@ export function getLegacyTeleptyShared(homeDir = os.homedir()) {
   return path.join(homeDir, '.telepty', 'shared');
 }
 
+export function getUserAtermConfigPath(homeDir = os.homedir()) {
+  return path.join(getUserAigentryRoot(homeDir), 'config', 'aterm.json');
+}
+
 export function resolveInstallHomeDir() {
   return resolveUserHomeFromSudoUser() ?? os.homedir();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmsdc-ai/aterm",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Native aterm launcher package",
   "type": "module",
   "main": "./bin/aterm.js",
@@ -17,7 +17,7 @@
     "package.json"
   ],
   "optionalDependencies": {
-    "@dmsdc-ai/aterm-darwin-arm64": "0.1.3"
+    "@dmsdc-ai/aterm-darwin-arm64": "0.1.4"
   },
   "dependencies": {
     "@dmsdc-ai/aigentry-brain": "latest",

package/scripts/postinstall.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
 import path from 'node:path';
-import { spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { createRequire } from 'node:module';
 import {
@@ -21,9 +20,6 @@ const require = createRequire(import.meta.url);
 const packageJson = JSON.parse(
   fs.readFileSync(path.join(packageRoot, 'package.json'), 'utf8'),
 );
-const TTY_REATTACH_FLAG = 'ATERM_POSTINSTALL_TTY_ATTACHED';
-
-console.log(`[aterm] postinstall start (${packageJson.version})`);
 
 const PLATFORM_PACKAGES = {
   darwin: {
@@ -35,69 +31,12 @@ function resolvePlatformPackage() {
   return PLATFORM_PACKAGES[process.platform]?.[process.arch] ?? null;
 }
 
-function canUseInteractiveInstaller() {
-  if (process.env.CI) {
-    return false;
-  }
-  if (process.env.npm_config_yes === 'true') {
-    return false;
-  }
-  return true;
-}
-
-function maybeReattachTTY() {
-  if (!canUseInteractiveInstaller()) {
-    return;
-  }
-  if (process.env[TTY_REATTACH_FLAG] === '1') {
-    return;
-  }
-  if (process.stdin.isTTY && process.stdout.isTTY) {
-    return;
-  }
-  if (process.platform === 'win32') {
-    return;
-  }
-
-  let ttyIn;
-  let ttyOut;
-  let ttyErr;
-
-  try {
-    ttyIn = fs.openSync('/dev/tty', 'r');
-    ttyOut = fs.openSync('/dev/tty', 'w');
-    ttyErr = fs.openSync('/dev/tty', 'w');
-  } catch {
-    return;
-  }
-
-  console.log('[aterm] reattaching postinstall to /dev/tty for interactive installer');
-  const result = spawnSync(process.execPath, [__filename], {
-    cwd: process.cwd(),
-    env: {
-      ...process.env,
-      [TTY_REATTACH_FLAG]: '1',
-    },
-    stdio: [ttyIn, ttyOut, ttyErr],
-  });
-
-  fs.closeSync(ttyIn);
-  fs.closeSync(ttyOut);
-  fs.closeSync(ttyErr);
-
-  if (result.status !== 0) {
-    process.exit(result.status ?? 1);
-  }
-
-  process.exit(0);
-}
-
-async function collectInstallerPlan() {
+function buildDefaultPlan() {
   const mode = isGlobalInstall() ? 'global' : 'local';
   const installRoot = process.env.INIT_CWD ? path.resolve(process.env.INIT_CWD) : process.cwd();
   const projectRoot = mode === 'local' ? resolveProjectRoot(installRoot) : null;
 
-  const defaultPlan = {
+  return {
     installLevels: mode === 'global' ? ['system', 'user'] : ['project'],
     configPatch: {
       shell: { default: 'zsh' },
@@ -119,25 +58,6 @@ async function collectInstallerPlan() {
     mode,
     projectRoot,
   };
-
-  let tuiModule;
-  try {
-    tuiModule = await import('./tui-installer.js');
-  } catch (error) {
-    console.warn(`[aterm] installer TUI unavailable, falling back to defaults (${error.message})`);
-    return defaultPlan;
-  }
-
-  if (!tuiModule.shouldRunInstallerTui()) {
-    return defaultPlan;
-  }
-
-  const context = tuiModule.buildInstallerContext(mode, projectRoot);
-  const plan = await tuiModule.runInstallerTui(context);
-  return {
-    ...defaultPlan,
-    ...plan,
-  };
 }
 
 function applyInstallPlan(plan, progress) {
@@ -224,42 +144,12 @@ function installNativeBundle() {
   fs.mkdirSync(path.dirname(targetApp), { recursive: true });
   fs.cpSync(sourceApp, targetApp, { recursive: true });
 
-  console.log(`[aterm] installed native bundle from ${platformPackage}`);
 }
 
-async function main() {
-  maybeReattachTTY();
-  const plan = await collectInstallerPlan();
-
-  let tuiModule = null;
-  try {
-    tuiModule = await import('./tui-installer.js');
-  } catch {
-    tuiModule = null;
-  }
-
-  if (tuiModule?.shouldRunInstallerTui()) {
-    await tuiModule.showProgressScreen(async (progress) => {
-      applyInstallPlan(plan, progress);
-      progress('{bold}Staging native bundle{/bold}');
-      installNativeBundle();
-      progress('{green-fg}ok{/} native bundle ready');
-    });
-
-    await tuiModule.showDoneScreen([
-      'aterm setup is complete.',
-      '',
-      `Mode: ${plan.mode}`,
-      `Levels: ${plan.installLevels.join(', ')}`,
-      `Shell: ${plan.configPatch.shell?.default ?? 'zsh'}`,
-      `Workspace: ${plan.configPatch.workspace?.default ?? 'home'}`,
-      `Tailscale connect: ${plan.configPatch.tailscale?.connect_on_launch ? 'yes' : 'no'}`,
-    ]);
-    return;
-  }
-
+function main() {
+  const plan = buildDefaultPlan();
   applyInstallPlan(plan);
   installNativeBundle();
 }
 
-await main();
+main();

package/scripts/tui-installer.js

@@ -1,7 +1,11 @@
-import os from 'node:os';
 import path from 'node:path';
 import { createRequire } from 'node:module';
-import { detectAiCliStatus, resolveInstallHomeDir } from '../lib/aigentry.js';
+import {
+  detectAiCliStatus,
+  resolveInstallHomeDir,
+  resolveProjectRoot,
+  updateConfigFile,
+} from '../lib/aigentry.js';
 
 const require = createRequire(import.meta.url);
 
@@ -56,7 +60,7 @@ function buildWorkspaceChoices(context) {
     });
   }
 
-  if (context.mode === 'local') {
+  if (context.projectRoot) {
     choices.push({
       title: 'current project',
       value: 'project',
@@ -101,7 +105,7 @@ function buildConfigPatch(context, answers) {
   };
 }
 
-export async function runInstallerTui(context) {
+export async function runFirstRunWizard(context) {
   const blessed = require('blessed');
   const prompts = (await import('prompts')).default;
 
@@ -111,10 +115,10 @@ export async function runInstallerTui(context) {
     [
       '{center}{bold}Aigentry Terminal Installer{/bold}{/center}',
       '',
-      'This installer will prepare the requested aigentry config level(s),',
-      'write default settings, and stage the native aterm bundle.',
+      'This wizard finishes your aterm setup before the native app launches.',
+      'It will save your preferred shell, workspace, and Tailscale defaults.',
       '',
-      `Detected install mode: ${context.mode}`,
+      `Package version: ${context.version}`,
     ],
     '{gray-fg}Press Enter to continue{/}',
   );
@@ -136,23 +140,14 @@ export async function runInstallerTui(context) {
 
   const workspaceChoices = buildWorkspaceChoices(context);
   const defaultResponses = {
-    installLevels: context.availableLevels.map(level => level.value),
     defaultShell: 'zsh',
     defaultWorkspace: workspaceChoices[0]?.value ?? 'home',
     tailscaleConnect: false,
   };
+  let cancelled = false;
 
   const responses = await prompts(
     [
-      {
-        type: 'multiselect',
-        name: 'installLevels',
-        message: 'Install level selection',
-        choices: context.availableLevels,
-        initial: 0,
-        instructions: false,
-        min: 1,
-      },
       {
         type: 'select',
         name: 'defaultShell',
@@ -181,23 +176,29 @@ export async function runInstallerTui(context) {
       },
     ],
     {
-      onCancel: () => true,
+      onCancel: () => {
+        cancelled = true;
+        return false;
+      },
     },
   );
 
+  if (cancelled) {
+    return null;
+  }
+
   const mergedAnswers = {
     ...defaultResponses,
     ...responses,
   };
 
   return {
-    installLevels: mergedAnswers.installLevels,
     configPatch: buildConfigPatch(context, mergedAnswers),
     summary: mergedAnswers,
   };
 }
 
-export function shouldRunInstallerTui() {
+export function shouldRunFirstRunWizard() {
   if (process.env.CI) {
     return false;
   }
@@ -207,38 +208,19 @@ export function shouldRunInstallerTui() {
   return Boolean(process.stdin.isTTY && process.stdout.isTTY);
 }
 
-export function buildInstallerContext(mode, projectRoot = null) {
+export function buildFirstRunWizardContext(version, cwd = process.cwd()) {
   const installHome = resolveInstallHomeDir();
+  const projectRoot = resolveProjectRoot(cwd);
   const orchestratorPath = path.join(installHome, 'projects', 'aigentry-orchestrator');
   const cliStatus = detectAiCliStatus(installHome);
-  const availableLevels = mode === 'global'
-    ? [
-        {
-          title: 'system',
-          value: 'system',
-          description: 'Create /etc/aigentry/config/aterm.json when writable',
-        },
-        {
-          title: 'user',
-          value: 'user',
-          description: `Create ${path.join(installHome, '.aigentry')}`,
-        },
-      ]
-    : [
-        {
-          title: 'project',
-          value: 'project',
-          description: `Create ${path.join(projectRoot ?? process.cwd(), '.aigentry')}`,
-        },
-      ];
 
   return {
-    mode,
+    version,
     projectRoot,
     cliStatus,
     orchestratorPath,
     orchestratorAvailable: require('node:fs').existsSync(orchestratorPath),
-    availableLevels,
+    userConfigPath: path.join(installHome, '.aigentry', 'config', 'aterm.json'),
   };
 }
 
@@ -288,3 +270,23 @@ export async function showDoneScreen(summaryLines) {
     '{green-fg}Run: aterm{/}',
   );
 }
+
+export async function completeFirstRunWizard(context, wizardResult) {
+  const blessed = require('blessed');
+  await showProgressScreen(async (progress) => {
+    progress('{bold}Saving setup{/bold}');
+    updateConfigFile(context.userConfigPath, {
+      ...wizardResult.configPatch,
+      setupCompleted: true,
+    });
+    progress(`{green-fg}ok{/} ${context.userConfigPath}`);
+  });
+
+  await showDoneScreen([
+    'aterm setup is complete.',
+    '',
+    `Shell: ${wizardResult.summary.defaultShell}`,
+    `Workspace: ${wizardResult.summary.defaultWorkspace}`,
+    `Tailscale connect: ${wizardResult.summary.tailscaleConnect ? 'yes' : 'no'}`,
+  ]);
+}