opencode-athena 0.6.0 → 0.7.0

package/dist/cli/index.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from 'url';
 import { confirm, select, checkbox } from '@inquirer/prompts';
 import chalk4 from 'chalk';
 import { Command } from 'commander';
-import { existsSync, readFileSync, copyFileSync, mkdirSync, writeFileSync } from 'fs';
+import { existsSync, readFileSync, mkdirSync, copyFileSync, unlinkSync, readdirSync, renameSync, writeFileSync } from 'fs';
 import { homedir } from 'os';
 import { exec, execSync } from 'child_process';
 import ora2 from 'ora';
@@ -435,14 +435,14 @@ function getPackageVersion() {
     for (const pkgPath of possiblePaths) {
       if (!existsSync(pkgPath)) continue;
       const content = readFileSync(pkgPath, "utf-8");
-      try {
-        const pkg = JSON.parse(content);
-        if (pkg.version) return pkg.version;
-      } catch {
-      }
+      const pkg = JSON.parse(content);
+      if (pkg.version) return pkg.version;
     }
     return "0.0.0";
-  } catch {
+  } catch (error) {
+    if (error instanceof SyntaxError) {
+      console.error("[opencode-athena] Warning: package.json contains invalid JSON");
+    }
     return "0.0.0";
   }
 }
@@ -462,8 +462,14 @@ var CONFIG_PATHS = {
   commandsDir: join(homedir(), ".config", "opencode", "command"),
   /** Plugin directory */
   pluginDir: join(homedir(), ".config", "opencode", "plugin"),
+  /** Athena internal files directory (state, backups) */
+  athenaDir: join(homedir(), ".config", "opencode", "athena"),
+  /** Athena backups directory */
+  backupsDir: join(homedir(), ".config", "opencode", "athena", "backups"),
   /** Athena state file (for story tracking) */
-  stateFile: join(homedir(), ".config", "opencode", "athena-state.json")
+  stateFile: join(homedir(), ".config", "opencode", "athena", "athena-state.json"),
+  /** Legacy state file path (for migration) */
+  legacyStateFile: join(homedir(), ".config", "opencode", "athena-state.json")
 };
 var DEFAULTS = {
   /** Maximum parallel stories */
@@ -635,13 +641,17 @@ var FileManager = class {
    */
   async removeConfigFiles() {
     const removedFiles = [];
-    const filesToRemove = [CONFIG_PATHS.globalAthenaConfig, CONFIG_PATHS.stateFile];
+    const filesToRemove = [CONFIG_PATHS.globalAthenaConfig, CONFIG_PATHS.legacyStateFile];
     for (const file of filesToRemove) {
       if (existsSync(file)) {
         await rm(file);
         removedFiles.push(file);
       }
     }
+    if (existsSync(CONFIG_PATHS.athenaDir)) {
+      await rm(CONFIG_PATHS.athenaDir, { recursive: true });
+      removedFiles.push(CONFIG_PATHS.athenaDir);
+    }
     return removedFiles;
   }
   /**
@@ -2213,22 +2223,25 @@ function mergeConfigs(options) {
   };
 }
 function createBackups() {
-  const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.TZ]/g, "-").replace(/--+/g, "-").replace(/-$/, "");
   const result = {
     athenaBackup: null,
     omoBackup: null,
     opencodeBackup: null
   };
+  if (!existsSync(CONFIG_PATHS.backupsDir)) {
+    mkdirSync(CONFIG_PATHS.backupsDir, { recursive: true });
+  }
   if (existsSync(CONFIG_PATHS.globalAthenaConfig)) {
-    result.athenaBackup = `${CONFIG_PATHS.globalAthenaConfig}.backup-${timestamp}`;
+    result.athenaBackup = join(CONFIG_PATHS.backupsDir, `athena.json.backup-${timestamp}`);
     copyFileSync(CONFIG_PATHS.globalAthenaConfig, result.athenaBackup);
   }
   if (existsSync(CONFIG_PATHS.globalOmoConfig)) {
-    result.omoBackup = `${CONFIG_PATHS.globalOmoConfig}.backup-${timestamp}`;
+    result.omoBackup = join(CONFIG_PATHS.backupsDir, `oh-my-opencode.json.backup-${timestamp}`);
     copyFileSync(CONFIG_PATHS.globalOmoConfig, result.omoBackup);
   }
   if (existsSync(CONFIG_PATHS.globalOpencodeConfig)) {
-    result.opencodeBackup = `${CONFIG_PATHS.globalOpencodeConfig}.backup-${timestamp}`;
+    result.opencodeBackup = join(CONFIG_PATHS.backupsDir, `opencode.json.backup-${timestamp}`);
     copyFileSync(CONFIG_PATHS.globalOpencodeConfig, result.opencodeBackup);
   }
   return result;
@@ -2268,8 +2281,57 @@ var MIGRATIONS = [
       }
       return { ...config, features };
     }
+  },
+  {
+    fromVersion: "0.5.0",
+    toVersion: "0.6.0",
+    description: "Migration system infrastructure (no config changes)",
+    migrateAthena: (config) => config
+  },
+  {
+    fromVersion: "0.6.0",
+    toVersion: "0.7.0",
+    description: "Reorganize athena files into dedicated directory",
+    migrateAthena: (config) => config
   }
 ];
+function migrateLegacyFiles() {
+  const result = {
+    stateFileMoved: false,
+    backupsMoved: 0
+  };
+  if (!existsSync(CONFIG_PATHS.athenaDir)) {
+    mkdirSync(CONFIG_PATHS.athenaDir, { recursive: true });
+  }
+  if (existsSync(CONFIG_PATHS.legacyStateFile) && !existsSync(CONFIG_PATHS.stateFile)) {
+    if (!existsSync(CONFIG_PATHS.athenaDir)) {
+      mkdirSync(CONFIG_PATHS.athenaDir, { recursive: true });
+    }
+    copyFileSync(CONFIG_PATHS.legacyStateFile, CONFIG_PATHS.stateFile);
+    unlinkSync(CONFIG_PATHS.legacyStateFile);
+    result.stateFileMoved = true;
+  }
+  const backupPattern = /\.(backup-\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2}-\d{3})$/;
+  const configDir = CONFIG_PATHS.globalConfigDir;
+  if (existsSync(configDir)) {
+    const files = readdirSync(configDir);
+    const legacyBackups = files.filter((f) => backupPattern.test(f));
+    if (legacyBackups.length > 0) {
+      if (!existsSync(CONFIG_PATHS.backupsDir)) {
+        mkdirSync(CONFIG_PATHS.backupsDir, { recursive: true });
+      }
+      for (const backupFile of legacyBackups) {
+        const sourcePath = join(configDir, backupFile);
+        const destPath = join(CONFIG_PATHS.backupsDir, backupFile);
+        if (!existsSync(destPath)) {
+          renameSync(sourcePath, destPath);
+          result.backupsMoved++;
+        }
+      }
+    }
+  }
+  return result;
+}
 
 // src/cli/utils/migrations/runner.ts
 init_esm_shims();
@@ -2288,9 +2350,7 @@ function migrateConfigs(athenaConfig, omoConfig, fromVersion) {
     return semver.compare(aVersion, bVersion);
   });
   for (const migration of sortedMigrations) {
-    const migrationFrom = semver.valid(semver.coerce(migration.fromVersion)) || "0.0.0";
     const migrationTo = semver.valid(semver.coerce(migration.toVersion)) || "0.0.0";
-    if (semver.gt(migrationFrom, normalizedFrom)) continue;
     if (semver.lte(migrationTo, normalizedFrom)) continue;
     if (semver.gt(migrationTo, normalizedTarget)) continue;
     if (migration.migrateAthena) {
@@ -2528,6 +2588,14 @@ Current version: ${existingVersion}`));
     Boolean
   ).length;
   spinner.succeed(`Created ${backupCount} backup file(s)`);
+  const fileMigrationResult = migrateLegacyFiles();
+  if (fileMigrationResult.stateFileMoved || fileMigrationResult.backupsMoved > 0) {
+    const moved = [];
+    if (fileMigrationResult.stateFileMoved) moved.push("state file");
+    if (fileMigrationResult.backupsMoved > 0)
+      moved.push(`${fileMigrationResult.backupsMoved} backup(s)`);
+    console.log(chalk4.gray(`  Migrated ${moved.join(", ")} to new athena/ directory`));
+  }
   const migrationSpinner = ora2("Applying migrations...").start();
   const migrationResult = migrateConfigs(athena || {}, omo || {}, existingVersion);
   if (migrationResult.migrationsApplied.length > 0) {
@@ -2585,10 +2653,9 @@ Current version: ${existingVersion}`));
           message: "Enable automatic git operations? (commits, pushes by agents)",
           default: false
         });
-        if (updatedFeatures) {
-          if (enable) {
-            updatedFeatures.enabledFeatures.push("auto-git");
-          }
+        if (enable) {
+          const migratedFeatures = migrationResult.athenaConfig.features;
+          migratedFeatures.autoGitOperations = true;
         }
       }
     }
@@ -3102,7 +3169,7 @@ program.command("install").description("Install and configure OpenCode Athena").
   await install(options);
 });
 program.command("upgrade").description("Upgrade OpenCode Athena configuration to latest version").option("-y, --yes", "Skip confirmation prompts", false).action(async (options) => {
-  await install({ ...options, preset: "none", advanced: false, global: true, local: false });
+  await install({ ...options, preset: void 0, advanced: false, global: true, local: false });
 });
 program.command("update").description("Update OpenCode Athena to latest version").option("--check", "Check for updates without installing", false).action(update);
 program.command("doctor").description("Diagnose and fix common issues").option("--fix", "Automatically fix issues", false).action(doctor);