@afffun/codexbot 1.0.94 → 1.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afffun/codexbot",
-  "version": "1.0.94",
+  "version": "1.0.95",
   "description": "Thin npm bootstrap CLI for installing and operating Codexbot nodes",
   "type": "module",
   "author": "john88188 <john88188@outlook.com>",

package/src/entrypoint.mjs

@@ -36,6 +36,7 @@ function renderUsage() {
     '  --openai-api-key <key>',
     '  --license-key <key>',
     '  install will auto-claim and activate when a license key is provided.',
+    '  on an existing install, current connector/API key/license settings are preserved unless explicit replacement flags are provided.',
     '  --license-file </path/to/license.json>',
     '  --license-public-key-file </path/to/license-public.pem>',
     '  --license-server-public-key-file </path/to/license-server-public.pem>',

package/src/install_seed_service.mjs

@@ -1,4 +1,5 @@
 import fs from 'node:fs/promises';
+import fsSync from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import {
@@ -9,6 +10,7 @@ import {
   promptUntilValid,
   trim,
 } from './input_contract_service.mjs';
+import { resolveInstalledControlLayout } from './installed_layout_service.mjs';
 
 async function promptForConnectorChoice(prompter, logger) {
   return promptUntilValid(prompter, {
@@ -218,12 +220,32 @@ function renderEnvFile(values = {}) {
 
 export function createNpmDistributionInstallSeedService(deps = {}) {
   const fsPromises = deps.fsPromises || fs;
+  const fsSyncModule = deps.fsSyncModule || fsSync;
   const osModule = deps.osModule || os;
   const pathModule = deps.pathModule || path;
   const processImpl = deps.processImpl || process;
   const logger = deps.logger || console;
   const nowIso = deps.nowIso || (() => new Date().toISOString());
   const promptFactory = deps.promptFactory || createPrompter;
+  const resolveInstalledLayout = deps.resolveInstalledLayout || resolveInstalledControlLayout;
+
+  function detectExistingInstall() {
+    try {
+      const layout = resolveInstalledLayout({
+        fsSync: fsSyncModule,
+        pathModule,
+        env: processImpl.env,
+      });
+      const hasControlEnv = Boolean(layout.controlEnvFile) && fsSyncModule.existsSync(layout.controlEnvFile);
+      const hasAppDir = Boolean(layout.appDir) && fsSyncModule.existsSync(layout.appDir);
+      if (!hasControlEnv && !hasAppDir) {
+        return { installed: false, layout };
+      }
+      return { installed: true, layout };
+    } catch {
+      return { installed: false, layout: null };
+    }
+  }
 
   async function prepareInstallSeed(options = {}) {
     const explicitSeedFiles = Boolean(
@@ -243,6 +265,8 @@ export function createNpmDistributionInstallSeedService(deps = {}) {
     };
 
     try {
+      const installState = detectExistingInstall();
+      const existingInstall = Boolean(installState.installed);
       const result = {
         seedEnvFile: trim(options.seedEnvFile),
         seedConnectorsStateFile: trim(options.seedConnectorsStateFile),
@@ -257,6 +281,7 @@ export function createNpmDistributionInstallSeedService(deps = {}) {
           connectorSeeded: false,
           openAiSeeded: false,
           licenseDeferred: false,
+          existingInstall,
         },
         cleanup,
       };
@@ -290,13 +315,22 @@ export function createNpmDistributionInstallSeedService(deps = {}) {
       if (!connector && hasExplicitConnectorArgs) {
         connector = trim(options.wecomBotId || options.wecomSecret || options.wecomTencentDocsApiKey) ? 'wecom' : 'telegram';
       }
-      if (!connector && !nonInteractive) {
+      const preserveExistingConnector = existingInstall && !hasExplicitConnectorArgs;
+      if (preserveExistingConnector) {
+        logger.log('==> Existing install detected; keeping current connector settings');
+      } else if (!connector && !nonInteractive) {
         logger.log('==> Remote control channel setup');
         connector = await promptForConnectorChoice(prompter, logger);
       }
       if (!connector) connector = 'skip';
 
-      const openAiApiKey = trim(options.openAiApiKey || (!nonInteractive ? await prompter.ask('OPENAI_API_KEY (optional, blank to skip): ') : ''));
+      const preserveExistingOpenAi = existingInstall && !trim(options.openAiApiKey);
+      if (preserveExistingOpenAi) {
+        logger.log('==> Existing install detected; keeping current OpenAI API key setting');
+      }
+      const openAiApiKey = preserveExistingOpenAi
+        ? ''
+        : trim(options.openAiApiKey || (!nonInteractive ? await prompter.ask('OPENAI_API_KEY (optional, blank to skip): ') : ''));
       if (openAiApiKey) {
         const envFile = pathModule.join(tempDir, 'seed.env');
         await fsPromises.writeFile(envFile, renderEnvFile({ OPENAI_API_KEY: openAiApiKey }), 'utf8');
@@ -304,7 +338,9 @@ export function createNpmDistributionInstallSeedService(deps = {}) {
         result.summary.openAiSeeded = true;
       }
 
-      if (connector === 'telegram') {
+      if (preserveExistingConnector) {
+        result.summary.connector = 'preserve';
+      } else if (connector === 'telegram') {
         const telegramBotToken = trim(options.telegramBotToken || (
           !nonInteractive
             ? await promptUntilValid(prompter, {
@@ -388,13 +424,22 @@ export function createNpmDistributionInstallSeedService(deps = {}) {
       let licenseFile = trim(options.licenseFile);
       let licensePublicKeyFile = trim(options.licensePublicKeyFile);
       let licenseServerPublicKeyFile = trim(options.licenseServerPublicKeyFile);
+      const hasExplicitLicenseInputs = Boolean(
+        licenseKey
+        || licenseFile
+        || licensePublicKeyFile
+        || licenseServerPublicKeyFile,
+      );
       if (licenseKey && (licenseFile || licensePublicKeyFile || licenseServerPublicKeyFile)) {
         throw new Error('license key cannot be combined with direct license file inputs');
       }
-      if (!licenseKey && !licenseFile && !licensePublicKeyFile && !licenseServerPublicKeyFile && !nonInteractive) {
+      const preserveExistingLicense = existingInstall && !hasExplicitLicenseInputs;
+      if (preserveExistingLicense) {
+        logger.log('==> Existing install detected; keeping current license state');
+      } else if (!licenseKey && !licenseFile && !licensePublicKeyFile && !licenseServerPublicKeyFile && !nonInteractive) {
         licenseKey = trim(await prompter.ask('License key (optional, blank to skip and activate later): '));
       }
-      if (!licenseKey && !licenseFile && !licensePublicKeyFile && !licenseServerPublicKeyFile) {
+      if (!preserveExistingLicense && !licenseKey && !licenseFile && !licensePublicKeyFile && !licenseServerPublicKeyFile) {
         result.deferLicenseActivation = true;
       }