@dmsdc-ai/aterm 0.1.13 → 0.1.15

package/bin/aterm.js

@@ -4,12 +4,8 @@ import path from 'node:path';
 import { spawn } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import {
-  detectAiCliStatus,
   ensureUserLayout,
-  getUserAtermConfigPath,
   resolveAigentryConfig,
-  resolveInstallHomeDir,
-  updateConfigFile,
 } from '../lib/aigentry.js';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -22,125 +18,12 @@ const packageJson = JSON.parse(
   fs.readFileSync(path.join(packageRoot, 'package.json'), 'utf8'),
 );
 
-function printVersionAndExit() {
+if (process.argv.includes('--version') || process.argv.includes('-v')) {
   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);
-}
-
-async function maybeRunConfigMigration() {
-  const configPath = getUserAtermConfigPath();
-  if (!fs.existsSync(configPath)) return;
-
-  let config;
-  try {
-    config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-  } catch { return; }
-
-  if (!config.setupCompleted) return;
-
-  const isTTY = process.stdin.isTTY && process.stdout.isTTY;
-  const cliStatus = detectAiCliStatus(resolveInstallHomeDir());
-  const patch = {};
-  const questions = [];
-
-  // Check each field individually — users from any version get prompted only for THEIR missing fields
-  if (!config.ai?.defaultCLI) {
-    questions.push({
-      type: 'select',
-      name: 'defaultCLI',
-      message: 'Default AI CLI for orchestrator workspace',
-      choices: [
-        { title: 'claude', value: 'claude', disabled: !cliStatus.claude },
-        { title: 'codex', value: 'codex', disabled: !cliStatus.codex },
-        { title: 'gemini', value: 'gemini', disabled: !cliStatus.gemini },
-        { title: 'none (plain zsh)', value: 'none' },
-      ],
-      initial: cliStatus.claude ? 0 : cliStatus.codex ? 1 : cliStatus.gemini ? 2 : 3,
-    });
-  }
-
-  if (questions.length === 0) return;
-
-  if (isTTY) {
-    try {
-      const prompts = (await import('prompts')).default;
-      const responses = await prompts(questions);
-      if (responses.defaultCLI) {
-        patch.ai = { ...config.ai, defaultCLI: responses.defaultCLI };
-      }
-    } catch { /* fall through to auto-detect */ }
-  }
-
-  // Auto-fill any fields not answered via prompt
-  if (!patch.ai?.defaultCLI && !config.ai?.defaultCLI) {
-    const auto = cliStatus.claude ? 'claude' : cliStatus.codex ? 'codex' : cliStatus.gemini ? 'gemini' : 'none';
-    patch.ai = { ...config.ai, ...patch.ai, defaultCLI: auto };
-  }
-
-  if (Object.keys(patch).length > 0) {
-    updateConfigFile(configPath, patch);
-  }
-}
-
-if (process.argv.includes('--version') || process.argv.includes('-v')) {
-  printVersionAndExit();
-}
-
-await maybeRunFirstRunWizard();
-await maybeRunConfigMigration();
-const resolvedConfig = resolveAigentryConfig({ cwd: process.cwd() });
+ensureUserLayout({ version: packageJson.version });
 
 if (!fs.existsSync(executable)) {
   console.error('[aterm] native app bundle is not installed');
@@ -148,6 +31,7 @@ if (!fs.existsSync(executable)) {
   process.exit(1);
 }
 
+const resolvedConfig = resolveAigentryConfig({ cwd: process.cwd() });
 for (const warning of resolvedConfig.warnings) {
   console.warn(warning);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmsdc-ai/aterm",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "Native aterm launcher package",
   "type": "module",
   "main": "./bin/aterm.js",
@@ -17,15 +17,13 @@
     "package.json"
   ],
   "optionalDependencies": {
-    "@dmsdc-ai/aterm-darwin-arm64": "0.1.13"
+    "@dmsdc-ai/aterm-darwin-arm64": "0.1.15"
   },
   "dependencies": {
     "@dmsdc-ai/aigentry-brain": "latest",
     "@dmsdc-ai/aigentry-deliberation": "latest",
     "@dmsdc-ai/aigentry-devkit": "latest",
-    "@dmsdc-ai/aigentry-telepty": "latest",
-    "blessed": "^0.1.81",
-    "prompts": "^2.4.2"
+    "@dmsdc-ai/aigentry-telepty": "latest"
   },
   "license": "UNLICENSED",
   "publishConfig": {

package/scripts/tui-installer.js

@@ -1,311 +0,0 @@
-import path from 'node:path';
-import { createRequire } from 'node:module';
-import {
-  detectAiCliStatus,
-  resolveInstallHomeDir,
-  resolveProjectRoot,
-  updateConfigFile,
-} from '../lib/aigentry.js';
-
-const require = createRequire(import.meta.url);
-
-function waitForKeypress(screen, keys = ['enter', 'space', 'escape']) {
-  return new Promise((resolve) => {
-    const handler = (_, key) => {
-      if (!key || !keys.includes(key.name)) {
-        return;
-      }
-      screen.off('keypress', handler);
-      resolve();
-    };
-    screen.on('keypress', handler);
-  });
-}
-
-async function showInfoScreen(blessed, title, lines, footer) {
-  const screen = blessed.screen({
-    smartCSR: true,
-    title: 'aterm installer',
-    fullUnicode: true,
-  });
-
-  blessed.box({
-    parent: screen,
-    top: 'center',
-    left: 'center',
-    width: '78%',
-    height: Math.max(12, lines.length + 6),
-    border: { type: 'line' },
-    tags: true,
-    label: ` ${title} `,
-    style: {
-      border: { fg: 'cyan' },
-      fg: 'white',
-    },
-    content: `${lines.join('\n')}\n\n${footer}`,
-  });
-
-  screen.render();
-  await waitForKeypress(screen);
-  screen.destroy();
-  // Reset terminal modes that blessed may leave set (DECCKM, keypad)
-  // so that subsequent prompts receive normal arrow key sequences.
-  process.stdout.write('\x1b[?1l\x1b>');
-}
-
-function buildWorkspaceChoices(context) {
-  const choices = [];
-  if (context.orchestratorAvailable) {
-    choices.push({
-      title: 'aigentry-orchestrator',
-      value: 'orchestrator',
-      description: context.orchestratorPath,
-    });
-  }
-
-  if (context.projectRoot) {
-    choices.push({
-      title: 'current project',
-      value: 'project',
-      description: context.projectRoot,
-    });
-  }
-
-  choices.push({
-    title: 'home directory',
-    value: 'home',
-    description: resolveInstallHomeDir(),
-  });
-
-  return choices;
-}
-
-function buildConfigPatch(context, answers) {
-  const workspacePathMap = {
-    orchestrator: context.orchestratorPath,
-    project: context.projectRoot,
-    home: resolveInstallHomeDir(),
-  };
-
-  return {
-    shell: {
-      default: answers.defaultShell,
-    },
-    workspace: {
-      default: answers.defaultWorkspace,
-      path: workspacePathMap[answers.defaultWorkspace] ?? resolveInstallHomeDir(),
-    },
-    orchestrator: {
-      enabled: answers.defaultWorkspace === 'orchestrator',
-      path: context.orchestratorPath,
-    },
-    tailscale: {
-      connect_on_launch: answers.tailscaleConnect,
-    },
-    ai: {
-      defaultCLI: answers.defaultCLI,
-      detected_clis: context.cliStatus,
-    },
-  };
-}
-
-export async function runFirstRunWizard(context) {
-  const blessed = require('blessed');
-  const prompts = (await import('prompts')).default;
-
-  await showInfoScreen(
-    blessed,
-    ' aterm Installer ',
-    [
-      '{center}{bold}Aigentry Terminal Installer{/bold}{/center}',
-      '',
-      'This wizard finishes your aterm setup before the native app launches.',
-      'It will save your preferred shell, workspace, and Tailscale defaults.',
-      '',
-      `Package version: ${context.version}`,
-    ],
-    '{gray-fg}Press Enter to continue{/}',
-  );
-
-  const cliLines = [
-    '{bold}AI CLI detection{/bold}',
-    '',
-    `claude ${context.cliStatus.claude ? '✅' : '❌'}`,
-    `codex  ${context.cliStatus.codex ? '✅' : '❌'}`,
-    `gemini ${context.cliStatus.gemini ? '✅' : '❌'}`,
-  ];
-
-  await showInfoScreen(
-    blessed,
-    ' CLI Status ',
-    cliLines,
-    '{gray-fg}Press Enter to continue{/}',
-  );
-
-  const workspaceChoices = buildWorkspaceChoices(context);
-  const defaultResponses = {
-    defaultShell: 'zsh',
-    defaultWorkspace: workspaceChoices[0]?.value ?? 'home',
-    defaultCLI: context.cliStatus.claude ? 'claude' : context.cliStatus.codex ? 'codex' : context.cliStatus.gemini ? 'gemini' : 'none',
-    tailscaleConnect: false,
-  };
-  let cancelled = false;
-
-  const responses = await prompts(
-    [
-      {
-        type: 'select',
-        name: 'defaultShell',
-        message: 'Default shell',
-        choices: [
-          { title: 'zsh', value: 'zsh' },
-          { title: 'bash', value: 'bash' },
-          { title: 'fish', value: 'fish' },
-        ],
-        initial: 0,
-      },
-      {
-        type: 'select',
-        name: 'defaultWorkspace',
-        message: 'Default workspace / orchestrator target',
-        choices: workspaceChoices,
-        initial: 0,
-      },
-      {
-        type: 'select',
-        name: 'defaultCLI',
-        message: 'Default AI CLI for orchestrator workspace',
-        choices: [
-          { title: 'claude', value: 'claude', disabled: !context.cliStatus.claude },
-          { title: 'codex', value: 'codex', disabled: !context.cliStatus.codex },
-          { title: 'gemini', value: 'gemini', disabled: !context.cliStatus.gemini },
-          { title: 'none (plain zsh)', value: 'none' },
-        ],
-        initial: context.cliStatus.claude ? 0 : context.cliStatus.codex ? 1 : context.cliStatus.gemini ? 2 : 3,
-      },
-      {
-        type: 'toggle',
-        name: 'tailscaleConnect',
-        message: 'Enable Tailscale connect on launch?',
-        initial: false,
-        active: 'yes',
-        inactive: 'no',
-      },
-    ],
-    {
-      onCancel: () => {
-        cancelled = true;
-        return false;
-      },
-    },
-  );
-
-  if (cancelled) {
-    return null;
-  }
-
-  const mergedAnswers = {
-    ...defaultResponses,
-    ...responses,
-  };
-
-  return {
-    configPatch: buildConfigPatch(context, mergedAnswers),
-    summary: mergedAnswers,
-  };
-}
-
-export function shouldRunFirstRunWizard() {
-  if (process.env.CI) {
-    return false;
-  }
-  if (process.env.npm_config_yes === 'true') {
-    return false;
-  }
-  return Boolean(process.stdin.isTTY && process.stdout.isTTY);
-}
-
-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);
-
-  return {
-    version,
-    projectRoot,
-    cliStatus,
-    orchestratorPath,
-    orchestratorAvailable: require('node:fs').existsSync(orchestratorPath),
-    userConfigPath: path.join(installHome, '.aigentry', 'config', 'aterm.json'),
-  };
-}
-
-export async function showProgressScreen(runSteps) {
-  const blessed = require('blessed');
-  const screen = blessed.screen({
-    smartCSR: true,
-    title: 'aterm installer',
-    fullUnicode: true,
-  });
-
-  const box = blessed.log({
-    parent: screen,
-    top: 'center',
-    left: 'center',
-    width: '84%',
-    height: '70%',
-    border: { type: 'line' },
-    tags: true,
-    label: ' Installation Progress ',
-    style: {
-      border: { fg: 'green' },
-      fg: 'white',
-    },
-    scrollable: true,
-    alwaysScroll: true,
-    scrollbar: { ch: ' ', inverse: true },
-  });
-
-  const report = (line) => {
-    box.add(line);
-    screen.render();
-  };
-
-  screen.render();
-  await runSteps(report);
-  await new Promise(resolve => setTimeout(resolve, 250));
-  screen.destroy();
-  process.stdout.write('\x1b[?1l\x1b>');
-}
-
-export async function showDoneScreen(summaryLines) {
-  const blessed = require('blessed');
-  await showInfoScreen(
-    blessed,
-    ' Install Complete ',
-    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}`,
-    `AI CLI: ${wizardResult.summary.defaultCLI}`,
-    `Workspace: ${wizardResult.summary.defaultWorkspace}`,
-    `Tailscale connect: ${wizardResult.summary.tailscaleConnect ? 'yes' : 'no'}`,
-  ]);
-}