replit-tools 1.0.10 → 1.1.1

package/README.md

@@ -32,14 +32,18 @@ Both are installed only if not already present. Existing installations are prese
 
 ## What Gets Persisted
 
+Everything is stored in a single `.replit-tools/` directory:
+
 | Data | Location | Survives Restart? |
 |------|----------|-------------------|
-| Claude conversations | `.claude-persistent/` | Yes |
-| Claude credentials | `.claude-persistent/` | Yes |
-| Claude binary | `.local/share/claude/versions/` | Yes |
-| Codex data | `.codex-persistent/` | Yes |
-| Bash history | `.persistent-home/` | Yes |
-| Per-terminal sessions | `.claude-sessions/` | Yes |
+| Claude conversations | `.replit-tools/.claude-persistent/` | Yes |
+| Claude credentials | `.replit-tools/.claude-persistent/` | Yes |
+| Claude binary | `.replit-tools/.claude-versions/` | Yes |
+| Codex data | `.replit-tools/.codex-persistent/` | Yes |
+| Bash history | `.replit-tools/.persistent-home/` | Yes |
+| Per-terminal sessions | `.replit-tools/.claude-sessions/` | Yes |
+| Auth logs | `.replit-tools/.logs/` | Yes |
+| Scripts | `.replit-tools/scripts/` | Yes |
 
 ## Automatic Token Refresh
 
@@ -55,10 +59,10 @@ This means you can leave overnight and come back to a working session - no more
 
 ```bash
 # Check token status
-/home/runner/workspace/scripts/claude-auth-refresh.sh --status
+/home/runner/workspace/.replit-tools/scripts/claude-auth-refresh.sh --status
 
 # Force refresh now
-/home/runner/workspace/scripts/claude-auth-refresh.sh --force
+/home/runner/workspace/.replit-tools/scripts/claude-auth-refresh.sh --force
 
 # Or use a permanent API token (never expires)
 claude setup-token
@@ -122,19 +126,19 @@ Press `c` to continue YOUR terminal's last session. Other terminals are unaffect
 
 ## How It Works
 
-The installer creates symlinks from ephemeral locations to persistent workspace storage:
+The installer creates symlinks from ephemeral locations to persistent `.replit-tools/` storage:
 
 ```
-~/.claude             →  /workspace/.claude-persistent/
-~/.codex              →  /workspace/.codex-persistent/
-~/.local/share/claude →  /workspace/.local/share/claude/
-~/.local/bin/claude   →  /workspace/.local/share/claude/versions/X.X.X
+~/.claude                        →  .replit-tools/.claude-persistent/
+~/.codex                         →  .replit-tools/.codex-persistent/
+~/.local/share/claude/versions/  →  .replit-tools/.claude-versions/
+~/.local/bin/claude              →  .replit-tools/.claude-versions/X.X.X
 ```
 
 Three layers ensure setup runs on every restart:
 1. `.replit` onBoot hook (runs at container boot)
 2. `.config/bashrc` (runs on every shell start)
-3. Scripts in `workspace/scripts/` (called by above)
+3. Scripts in `.replit-tools/scripts/` (called by above)
 
 ## Smart Detection
 
@@ -142,7 +146,7 @@ The installer checks for:
 
 - **`CLAUDE_CONFIG_DIR`** - Respects custom Claude config directory if set in Replit Secrets
 - **`CODEX_HOME`** - Respects custom Codex config directory
-- **Existing persistent config** - Uses your existing config if present
+- **Existing persistent config** - Uses your existing config if present (won't migrate if custom dir set)
 - **Replit Secrets** - Detects `ANTHROPIC_API_KEY` and `OPENAI_API_KEY`
 - **Existing installations** - Won't reinstall Claude or Codex if already present
 - **Existing data in ~/.claude** - Moves it to persistent storage instead of overwriting
@@ -168,7 +172,7 @@ The installer checks for:
 | `CODEX_DATA_DIR` | Alternative name |
 | `OPENAI_API_KEY` | Codex API authentication |
 
-If you set these in your Replit Secrets to paths inside `/home/runner/workspace/`, DATA Tools will use those directories for persistence instead of the defaults.
+If you set these in your Replit Secrets to paths inside `/home/runner/workspace/`, DATA Tools will use those directories for persistence instead of the defaults. **Your custom directories will NOT be migrated** - we respect your configuration.
 
 ## Installation Options
 
@@ -224,26 +228,46 @@ Creates a long-lived API token that never expires (recommended for unattended us
 
 ```
 workspace/
-├── .claude-persistent/     # Claude conversations & credentials
-├── .codex-persistent/      # Codex CLI data
-├── .claude-sessions/       # Per-terminal session tracking
-├── .local/share/claude/    # Claude binary versions
-├── .persistent-home/       # Bash history
-├── .config/bashrc          # Shell startup config
-├── logs/                   # Auth refresh logs
-├── scripts/
-│   ├── setup-claude-code.sh      # Main setup script
-│   ├── claude-session-manager.sh # Interactive session picker
-│   └── claude-auth-refresh.sh    # OAuth token auto-refresh
-└── .gitignore              # Updated to ignore credential dirs
+├── .replit-tools/                    # All DATA Tools data (gitignored)
+│   ├── .claude-persistent/           # Claude conversations & credentials
+│   ├── .codex-persistent/            # Codex CLI data
+│   ├── .claude-sessions/             # Per-terminal session tracking
+│   ├── .claude-versions/             # Claude binary versions
+│   ├── .persistent-home/             # Bash history
+│   ├── .logs/                        # Auth refresh logs
+│   └── scripts/                      # Setup & management scripts
+│       ├── setup-claude-code.sh
+│       ├── claude-session-manager.sh
+│       └── claude-auth-refresh.sh
+├── .config/bashrc                    # Shell startup config (sources scripts)
+└── .gitignore                        # Updated to ignore .replit-tools/
+```
+
+## Upgrading from v1.x
+
+If you used DATA Tools v1.x (before the `.replit-tools/` consolidation), your data will be automatically migrated:
+
+```
+Old Location                    →  New Location
+.claude-persistent/             →  .replit-tools/.claude-persistent/
+.codex-persistent/              →  .replit-tools/.codex-persistent/
+.claude-sessions/               →  .replit-tools/.claude-sessions/
+.persistent-home/               →  .replit-tools/.persistent-home/
+.local/share/claude/versions/   →  .replit-tools/.claude-versions/
 ```
 
+Migration only happens if:
+1. Old location exists AND new location doesn't
+2. You don't have custom `CLAUDE_CONFIG_DIR` or `CODEX_HOME` set
+
+Your original data is copied (not moved), so nothing is lost.
+
 ## Troubleshooting
 
 ### Claude or Codex not found after restart
 
 ```bash
-source /home/runner/workspace/scripts/setup-claude-code.sh
+source /home/runner/workspace/.replit-tools/scripts/setup-claude-code.sh
 ```
 
 ### Session picker not appearing
@@ -258,10 +282,10 @@ The auto-refresh should handle this, but if it fails:
 
 ```bash
 # Check why refresh failed
-cat /home/runner/workspace/logs/auth-refresh.log
+cat /home/runner/workspace/.replit-tools/.logs/auth-refresh.log
 
 # Manual refresh
-/home/runner/workspace/scripts/claude-auth-refresh.sh --force
+/home/runner/workspace/.replit-tools/scripts/claude-auth-refresh.sh --force
 
 # Or use permanent token (recommended)
 claude setup-token
@@ -277,15 +301,15 @@ Running the installer again is safe - it preserves existing data.
 
 ## Security
 
-The installer adds these to `.gitignore`:
+The installer adds `.replit-tools/` to `.gitignore`, which protects:
 
 | Path | Contains | Why Protected |
 |------|----------|---------------|
-| `.claude-persistent/` | OAuth tokens, refresh tokens, conversations | **Critical** - full account access |
-| `.codex-persistent/` | API keys in `auth.json`, conversations | **Critical** - full account access |
-| `.claude-sessions/` | Session UUIDs, terminal mappings | Session metadata |
-| `.persistent-home/` | Bash history | May contain typed secrets |
-| `logs/auth-refresh.log` | Token refresh timestamps | Auth timing info |
+| `.replit-tools/.claude-persistent/` | OAuth tokens, refresh tokens, conversations | **Critical** - full account access |
+| `.replit-tools/.codex-persistent/` | API keys in `auth.json`, conversations | **Critical** - full account access |
+| `.replit-tools/.claude-sessions/` | Session UUIDs, terminal mappings | Session metadata |
+| `.replit-tools/.persistent-home/` | Bash history | May contain typed secrets |
+| `.replit-tools/.logs/` | Token refresh timestamps | Auth timing info |
 
 Your API keys, OAuth tokens, and conversation history won't be committed to git.
 

package/index.js

@@ -7,6 +7,7 @@ const os = require('os');
 
 const WORKSPACE = '/home/runner/workspace';
 const HOME = os.homedir();
+const REPLIT_TOOLS = path.join(WORKSPACE, '.replit-tools');
 
 // Helper to run commands safely without crashing the installer
 function safeExec(cmd, options = {}) {
@@ -20,7 +21,6 @@ function safeExec(cmd, options = {}) {
     });
 
     if (options.showOutput && result.stdout) {
-      // Show condensed output
       const lines = result.stdout.trim().split('\n');
       if (lines.length <= 5) {
         lines.forEach(l => console.log(`   ${l}`));
@@ -47,6 +47,21 @@ function safeExec(cmd, options = {}) {
   }
 }
 
+// Helper to migrate data from old location to new
+function migrateDirectory(oldPath, newPath, description) {
+  if (fs.existsSync(oldPath) && !fs.existsSync(newPath)) {
+    try {
+      console.log(`   Migrating ${description}...`);
+      execSync(`cp -rp "${oldPath}" "${newPath}"`, { shell: '/bin/bash' });
+      return true;
+    } catch (err) {
+      console.log(`   ⚠️  Could not migrate ${description}: ${err.message}`);
+      return false;
+    }
+  }
+  return false;
+}
+
 // Wrap everything in try-catch to prevent crashes
 try {
   main();
@@ -89,11 +104,34 @@ function main() {
     return process.env[name] || null;
   }
 
+  // ═══════════════════════════════════════════════════════════════════
+  // DEFINE DIRECTORY STRUCTURE
+  // ═══════════════════════════════════════════════════════════════════
+
+  // Default locations inside .replit-tools (all hidden with dots)
+  const defaultClaudeDir = path.join(REPLIT_TOOLS, '.claude-persistent');
+  const defaultCodexDir = path.join(REPLIT_TOOLS, '.codex-persistent');
+  const sessionsDir = path.join(REPLIT_TOOLS, '.claude-sessions');
+  const persistentHomeDir = path.join(REPLIT_TOOLS, '.persistent-home');
+  const claudeVersionsDir = path.join(REPLIT_TOOLS, '.claude-versions');
+  const logsDir = path.join(REPLIT_TOOLS, '.logs');
+  const scriptsDir = path.join(REPLIT_TOOLS, 'scripts');
+
+  // Old locations (for migration)
+  const oldLocations = {
+    claude: path.join(WORKSPACE, '.claude-persistent'),
+    codex: path.join(WORKSPACE, '.codex-persistent'),
+    sessions: path.join(WORKSPACE, '.claude-sessions'),
+    home: path.join(WORKSPACE, '.persistent-home'),
+    versions: path.join(WORKSPACE, '.local/share/claude/versions'),
+    logs: path.join(WORKSPACE, 'logs'),
+    scripts: path.join(WORKSPACE, 'scripts')
+  };
+
   // ═══════════════════════════════════════════════════════════════════
   // CLAUDE CONFIG DIRECTORY DETECTION
   // ═══════════════════════════════════════════════════════════════════
 
-  // Check for all possible Claude config env vars
   const claudeConfigEnvVars = [
     'CLAUDE_CONFIG_DIR',
     'CLAUDE_WORKSPACE_DIR',
@@ -115,14 +153,16 @@ function main() {
   }
 
   // Determine Claude persistent directory
-  let claudePersistentDir = path.join(WORKSPACE, '.claude-persistent');
+  let claudePersistentDir = defaultClaudeDir;
+  let usingCustomClaudeDir = false;
 
   if (customClaudeDir) {
     if (customClaudeDir.startsWith(WORKSPACE)) {
       claudePersistentDir = customClaudeDir;
-      console.log(`   Using custom Claude directory`);
+      usingCustomClaudeDir = true;
+      console.log(`   Using custom Claude directory (not migrating)`);
     } else {
-      console.log(`   ⚠️  Custom dir outside workspace - will redirect to workspace for persistence`);
+      console.log(`   ⚠️  Custom dir outside workspace - using .replit-tools for persistence`);
     }
   }
 
@@ -130,7 +170,6 @@ function main() {
   // CODEX CONFIG DIRECTORY DETECTION
   // ═══════════════════════════════════════════════════════════════════
 
-  // Check for Codex config env vars
   const codexConfigEnvVars = [
     'CODEX_HOME',
     'CODEX_CONFIG_DIR',
@@ -151,32 +190,23 @@ function main() {
   }
 
   // Determine Codex persistent directory
-  let codexPersistentDir = path.join(WORKSPACE, '.codex-persistent');
+  let codexPersistentDir = defaultCodexDir;
+  let usingCustomCodexDir = false;
 
   if (customCodexDir) {
     if (customCodexDir.startsWith(WORKSPACE)) {
       codexPersistentDir = customCodexDir;
-      console.log(`   Using custom Codex directory`);
+      usingCustomCodexDir = true;
+      console.log(`   Using custom Codex directory (not migrating)`);
     } else {
-      console.log(`   ⚠️  Custom dir outside workspace - will redirect to workspace for persistence`);
+      console.log(`   ⚠️  Custom dir outside workspace - using .replit-tools for persistence`);
     }
   }
 
   // ═══════════════════════════════════════════════════════════════════
-  // CHECK FOR EXISTING CONFIG
+  // CHECK FOR API KEYS
   // ═══════════════════════════════════════════════════════════════════
 
-  const existingClaudeConfig = fs.existsSync(claudePersistentDir);
-  const existingCodexConfig = fs.existsSync(codexPersistentDir);
-
-  if (existingClaudeConfig) {
-    console.log(`✅ Found existing Claude config`);
-  }
-  if (existingCodexConfig) {
-    console.log('✅ Found existing Codex config');
-  }
-
-  // Check for API key secrets
   if (getEnvVar('ANTHROPIC_API_KEY')) {
     console.log('✅ Found ANTHROPIC_API_KEY');
   }
@@ -188,44 +218,77 @@ function main() {
   // CREATE DIRECTORIES
   // ═══════════════════════════════════════════════════════════════════
 
-  const dirs = [
-    '.claude-sessions',
-    '.local/share/claude/versions',
-    '.persistent-home',
-    '.config',
-    'scripts',
-    'logs'
-  ];
+  console.log('');
+  console.log('📁 Creating directories...');
 
-  // Add Claude persistent dir
-  if (claudePersistentDir.startsWith(WORKSPACE)) {
-    const relativePath = claudePersistentDir.replace(WORKSPACE + '/', '');
-    if (!dirs.includes(relativePath)) {
-      dirs.unshift(relativePath);
-    }
+  // Create base .replit-tools directory
+  if (!fs.existsSync(REPLIT_TOOLS)) {
+    fs.mkdirSync(REPLIT_TOOLS, { recursive: true });
   }
 
-  // Add Codex persistent dir
-  if (codexPersistentDir.startsWith(WORKSPACE)) {
-    const relativePath = codexPersistentDir.replace(WORKSPACE + '/', '');
-    if (!dirs.includes(relativePath)) {
-      dirs.unshift(relativePath);
-    }
-  }
+  // Create all subdirectories
+  const dirsToCreate = [
+    claudePersistentDir,
+    codexPersistentDir,
+    sessionsDir,
+    persistentHomeDir,
+    claudeVersionsDir,
+    logsDir,
+    scriptsDir,
+    path.join(WORKSPACE, '.config') // Keep .config in workspace for Replit auto-sourcing
+  ];
 
-  console.log('');
-  console.log('📁 Creating directories...');
-  dirs.forEach(dir => {
-    const fullPath = path.join(WORKSPACE, dir);
-    if (!fs.existsSync(fullPath)) {
+  dirsToCreate.forEach(dir => {
+    if (!fs.existsSync(dir)) {
       try {
-        fs.mkdirSync(fullPath, { recursive: true });
+        fs.mkdirSync(dir, { recursive: true });
       } catch (err) {
         console.log(`   ⚠️  Could not create ${dir}: ${err.message}`);
       }
     }
   });
 
+  // ═══════════════════════════════════════════════════════════════════
+  // MIGRATE FROM OLD LOCATIONS
+  // ═══════════════════════════════════════════════════════════════════
+
+  console.log('');
+  console.log('🔄 Checking for data migration...');
+
+  let migrated = false;
+
+  // Migrate Claude data (only if not using custom dir)
+  if (!usingCustomClaudeDir) {
+    if (migrateDirectory(oldLocations.claude, claudePersistentDir, 'Claude config')) {
+      migrated = true;
+    }
+  }
+
+  // Migrate Codex data (only if not using custom dir)
+  if (!usingCustomCodexDir) {
+    if (migrateDirectory(oldLocations.codex, codexPersistentDir, 'Codex config')) {
+      migrated = true;
+    }
+  }
+
+  // Always migrate these (no custom dir options)
+  if (migrateDirectory(oldLocations.sessions, sessionsDir, 'session data')) migrated = true;
+  if (migrateDirectory(oldLocations.home, persistentHomeDir, 'bash history')) migrated = true;
+  if (migrateDirectory(oldLocations.versions, claudeVersionsDir, 'Claude versions')) migrated = true;
+
+  // Migrate logs (just auth-refresh.log)
+  if (fs.existsSync(path.join(oldLocations.logs, 'auth-refresh.log')) && !fs.existsSync(path.join(logsDir, 'auth-refresh.log'))) {
+    try {
+      fs.copyFileSync(path.join(oldLocations.logs, 'auth-refresh.log'), path.join(logsDir, 'auth-refresh.log'));
+      migrated = true;
+      console.log('   Migrating auth logs...');
+    } catch {}
+  }
+
+  if (!migrated) {
+    console.log('   No migration needed');
+  }
+
   // ═══════════════════════════════════════════════════════════════════
   // INSTALL CLAUDE CODE
   // ═══════════════════════════════════════════════════════════════════
@@ -234,10 +297,16 @@ function main() {
 
   let claudeVersions = [];
   try {
-    claudeVersions = fs.readdirSync(path.join(WORKSPACE, '.local/share/claude/versions'))
-      .filter(f => !f.startsWith('.'));
+    claudeVersions = fs.readdirSync(claudeVersionsDir).filter(f => !f.startsWith('.'));
   } catch {}
 
+  // Also check old location
+  if (claudeVersions.length === 0) {
+    try {
+      claudeVersions = fs.readdirSync(oldLocations.versions).filter(f => !f.startsWith('.'));
+    } catch {}
+  }
+
   const claudeInstalled = commandExists('claude') ||
     fs.existsSync(path.join(HOME, '.local/bin/claude')) ||
     claudeVersions.length > 0;
@@ -251,12 +320,27 @@ function main() {
     };
     const result = safeExec('curl -fsSL https://claude.ai/install.sh | bash', {
       env: installEnv,
-      timeout: 180000, // 3 minute timeout
+      timeout: 180000,
       showOutput: true
     });
 
     if (result.success) {
       console.log('✅ Claude Code installed');
+      // Move installed version to our directory
+      try {
+        const defaultVersionsDir = path.join(HOME, '.local/share/claude/versions');
+        if (fs.existsSync(defaultVersionsDir)) {
+          const versions = fs.readdirSync(defaultVersionsDir).filter(f => !f.startsWith('.'));
+          versions.forEach(v => {
+            const src = path.join(defaultVersionsDir, v);
+            const dest = path.join(claudeVersionsDir, v);
+            if (!fs.existsSync(dest)) {
+              fs.copyFileSync(src, dest);
+              fs.chmodSync(dest, '755');
+            }
+          });
+        }
+      } catch {}
     } else {
       console.log('⚠️  Claude Code installation had issues (may still work)');
       if (result.stderr && result.stderr.length < 200) {
@@ -282,7 +366,7 @@ function main() {
     };
     const result = safeExec('npm i -g @openai/codex', {
       env: installEnv,
-      timeout: 180000, // 3 minute timeout
+      timeout: 180000,
       showOutput: true
     });
 
@@ -305,7 +389,7 @@ function main() {
   console.log('');
   console.log('🔗 Setting up symlinks...');
 
-  // Claude symlink
+  // Claude config symlink (~/.claude -> our persistent dir)
   const claudeLink = path.join(HOME, '.claude');
   try {
     let needsLink = false;
@@ -330,12 +414,13 @@ function main() {
     if (needsLink) {
       fs.symlinkSync(claudePersistentDir, claudeLink);
     }
-    console.log(`   ~/.claude → ${claudePersistentDir.replace(WORKSPACE + '/', '')}/`);
+    const displayPath = claudePersistentDir.replace(WORKSPACE + '/', '');
+    console.log(`   ~/.claude → ${displayPath}/`);
   } catch (err) {
     console.log(`   ⚠️  Could not create Claude symlink: ${err.message}`);
   }
 
-  // Codex symlink
+  // Codex config symlink (~/.codex -> our persistent dir)
   const codexLink = path.join(HOME, '.codex');
   try {
     let needsLink = false;
@@ -360,7 +445,8 @@ function main() {
     if (needsLink) {
       fs.symlinkSync(codexPersistentDir, codexLink);
     }
-    console.log(`   ~/.codex → ${codexPersistentDir.replace(WORKSPACE + '/', '')}/`);
+    const displayPath = codexPersistentDir.replace(WORKSPACE + '/', '');
+    console.log(`   ~/.codex → ${displayPath}/`);
   } catch (err) {
     console.log(`   ⚠️  Could not create Codex symlink: ${err.message}`);
   }
@@ -368,45 +454,51 @@ function main() {
   // Claude binary symlinks
   const localBin = path.join(HOME, '.local/bin');
   const localShare = path.join(HOME, '.local/share');
-  const claudeShareTarget = path.join(WORKSPACE, '.local/share/claude');
 
   try { fs.mkdirSync(localBin, { recursive: true }); } catch {}
   try { fs.mkdirSync(localShare, { recursive: true }); } catch {}
 
-  // Link .local/share/claude
+  // Link .local/share/claude to our versions directory's parent
+  const claudeShareTarget = path.join(REPLIT_TOOLS, '.claude-versions');
   try {
-    let needsLink = false;
+    // Create a wrapper directory structure for compatibility
+    const shareClaudeDir = path.join(localShare, 'claude');
+    const shareVersionsDir = path.join(shareClaudeDir, 'versions');
+
+    if (!fs.existsSync(shareClaudeDir)) {
+      fs.mkdirSync(shareClaudeDir, { recursive: true });
+    }
+
+    // Symlink versions dir
     try {
-      const stat = fs.lstatSync(path.join(localShare, 'claude'));
+      const stat = fs.lstatSync(shareVersionsDir);
       if (stat.isSymbolicLink()) {
-        const current = fs.readlinkSync(path.join(localShare, 'claude'));
-        if (current !== claudeShareTarget) {
-          fs.unlinkSync(path.join(localShare, 'claude'));
-          needsLink = true;
+        const current = fs.readlinkSync(shareVersionsDir);
+        if (current !== claudeVersionsDir) {
+          fs.unlinkSync(shareVersionsDir);
+          fs.symlinkSync(claudeVersionsDir, shareVersionsDir);
         }
       }
     } catch {
-      needsLink = true;
+      fs.symlinkSync(claudeVersionsDir, shareVersionsDir);
     }
-
-    if (needsLink) {
-      fs.symlinkSync(claudeShareTarget, path.join(localShare, 'claude'));
-    }
-    console.log('   ~/.local/share/claude → .local/share/claude/');
+    console.log(`   ~/.local/share/claude/versions → .replit-tools/.claude-versions/`);
   } catch {}
 
   // Link binary to latest version
   try {
-    const versions = fs.readdirSync(path.join(WORKSPACE, '.local/share/claude/versions'))
-      .filter(f => !f.startsWith('.'))
-      .sort();
+    let versions = [];
+    try {
+      versions = fs.readdirSync(claudeVersionsDir).filter(f => !f.startsWith('.')).sort();
+    } catch {}
+
     if (versions.length > 0) {
       const latest = versions[versions.length - 1];
-      const binaryPath = path.join(WORKSPACE, '.local/share/claude/versions', latest);
+      const binaryPath = path.join(claudeVersionsDir, latest);
       const binLink = path.join(localBin, 'claude');
       try { fs.unlinkSync(binLink); } catch {}
       fs.symlinkSync(binaryPath, binLink);
-      console.log(`   ~/.local/bin/claude → versions/${latest}`);
+      console.log(`   ~/.local/bin/claude → .replit-tools/.claude-versions/${latest}`);
     }
   } catch {}
 
@@ -414,16 +506,15 @@ function main() {
   // COPY SCRIPTS
   // ═══════════════════════════════════════════════════════════════════
 
-  const scriptsDir = path.join(__dirname, 'scripts');
-  const targetScriptsDir = path.join(WORKSPACE, 'scripts');
+  const packageScriptsDir = path.join(__dirname, 'scripts');
 
   console.log('');
   console.log('📝 Installing scripts...');
 
-  const scripts = ['setup-claude-code.sh', 'claude-session-manager.sh', 'claude-auth-refresh.sh'];
-  scripts.forEach(script => {
-    const srcPath = path.join(scriptsDir, script);
-    const destPath = path.join(targetScriptsDir, script);
+  const scriptFiles = ['setup-claude-code.sh', 'claude-session-manager.sh', 'claude-auth-refresh.sh'];
+  scriptFiles.forEach(script => {
+    const srcPath = path.join(packageScriptsDir, script);
+    const destPath = path.join(scriptsDir, script);
 
     if (fs.existsSync(srcPath)) {
       try {
@@ -445,7 +536,10 @@ function main() {
 
   const bashrcContent = `#!/bin/bash
 # DATA Tools - Replit Claude & Codex Persistence
-# Auto-generated bashrc
+# Auto-generated bashrc - v2.0 (.replit-tools structure)
+
+# Base directory for all DATA Tools data
+export REPLIT_TOOLS_DIR="${REPLIT_TOOLS}"
 
 # Claude Config Directory (tells Claude where to store data)
 export CLAUDE_CONFIG_DIR="${claudePersistentDir}"
@@ -455,7 +549,7 @@ export CLAUDE_WORKSPACE_DIR="${claudePersistentDir}"
 export CODEX_HOME="${codexPersistentDir}"
 
 # Claude Code Setup
-SETUP_SCRIPT="/home/runner/workspace/scripts/setup-claude-code.sh"
+SETUP_SCRIPT="${scriptsDir}/setup-claude-code.sh"
 [ -f "\${SETUP_SCRIPT}" ] && source "\${SETUP_SCRIPT}"
 
 # Codex Persistence
@@ -463,7 +557,7 @@ mkdir -p "${codexPersistentDir}"
 [ ! -L "\${HOME}/.codex" ] && ln -sf "${codexPersistentDir}" "\${HOME}/.codex"
 
 # Bash History Persistence
-PERSISTENT_HOME="/home/runner/workspace/.persistent-home"
+PERSISTENT_HOME="${persistentHomeDir}"
 mkdir -p "\${PERSISTENT_HOME}"
 export HISTFILE="\${PERSISTENT_HOME}/.bash_history"
 export HISTSIZE=10000
@@ -472,7 +566,7 @@ export HISTCONTROL=ignoredups
 [ -f "\${HISTFILE}" ] && history -r "\${HISTFILE}"
 
 # Session Manager (interactive menu)
-SESSION_MANAGER="/home/runner/workspace/scripts/claude-session-manager.sh"
+SESSION_MANAGER="${scriptsDir}/claude-session-manager.sh"
 [ -f "\${SESSION_MANAGER}" ] && source "\${SESSION_MANAGER}"
 
 # Aliases
@@ -493,15 +587,17 @@ alias claude-pick='claude -r --dangerously-skip-permissions'
 
   console.log('📝 Updating .replit configuration...');
   const replitPath = path.join(WORKSPACE, '.replit');
-  const onBootLine = 'onBoot = "source /home/runner/workspace/scripts/setup-claude-code.sh 2>/dev/null || true"';
+  const onBootLine = `onBoot = "source ${scriptsDir}/setup-claude-code.sh 2>/dev/null || true"`;
 
   try {
     if (fs.existsSync(replitPath)) {
       let content = fs.readFileSync(replitPath, 'utf8');
+      // Remove old onBoot line if present
+      content = content.replace(/onBoot\s*=\s*"[^"]*setup-claude-code\.sh[^"]*"\n?/g, '');
       if (!content.includes('setup-claude-code.sh')) {
         content += '\n\n# Claude persistence (added by DATA Tools)\n' + onBootLine + '\n';
-        fs.writeFileSync(replitPath, content);
       }
+      fs.writeFileSync(replitPath, content);
     } else {
       fs.writeFileSync(replitPath, '# Claude persistence (DATA Tools)\n' + onBootLine + '\n');
     }
@@ -516,18 +612,14 @@ alias claude-pick='claude -r --dangerously-skip-permissions'
   console.log('📝 Updating .gitignore...');
   const gitignorePath = path.join(WORKSPACE, '.gitignore');
   const gitignoreEntries = `
-# Claude/Codex data (added by DATA Tools)
-.claude-persistent/
-.codex-persistent/
-.claude-sessions/
-.persistent-home/
-logs/auth-refresh.log
+# DATA Tools - All sensitive data in one place (added by DATA Tools)
+.replit-tools/
 `;
 
   try {
     if (fs.existsSync(gitignorePath)) {
       let content = fs.readFileSync(gitignorePath, 'utf8');
-      if (!content.includes('.claude-persistent')) {
+      if (!content.includes('.replit-tools/')) {
         fs.writeFileSync(gitignorePath, content + gitignoreEntries);
       }
     } else {
@@ -545,6 +637,7 @@ logs/auth-refresh.log
   process.env.CLAUDE_CONFIG_DIR = claudePersistentDir;
   process.env.CLAUDE_WORKSPACE_DIR = claudePersistentDir;
   process.env.CODEX_HOME = codexPersistentDir;
+  process.env.REPLIT_TOOLS_DIR = REPLIT_TOOLS;
 
   // ═══════════════════════════════════════════════════════════════════
   // SHOW COMPLETION MESSAGE
@@ -566,8 +659,12 @@ logs/auth-refresh.log
   console.log('║                                                             ║');
   console.log('╠═════════════════════════════════════════════════════════════╣');
   console.log('║                                                             ║');
-  console.log(`║   Claude config: ${claudePersistentDir.replace(WORKSPACE + '/', '').padEnd(38)}  ║`);
-  console.log(`║   Codex config:  ${codexPersistentDir.replace(WORKSPACE + '/', '').padEnd(38)}  ║`);
+  console.log('║   All data stored in: .replit-tools/                        ║');
+  console.log('║                                                             ║');
+  const claudeDisplay = claudePersistentDir.replace(WORKSPACE + '/', '').padEnd(40);
+  const codexDisplay = codexPersistentDir.replace(WORKSPACE + '/', '').padEnd(40);
+  console.log(`║   Claude: ${claudeDisplay} ║`);
+  console.log(`║   Codex:  ${codexDisplay} ║`);
   console.log('║                                                             ║');
   console.log('╚═════════════════════════════════════════════════════════════╝');
   console.log('');
@@ -598,7 +695,6 @@ logs/auth-refresh.log
   console.log('Launching session manager...');
   console.log('');
 
-  // Use spawn to run bash interactively with our session manager
   const sessionManager = spawn('bash', ['--rcfile', path.join(WORKSPACE, '.config/bashrc'), '-i'], {
     stdio: 'inherit',
     cwd: WORKSPACE,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replit-tools",
-  "version": "1.0.10",
+  "version": "1.1.1",
   "description": "DATA Tools - One command to set up Claude Code and Codex CLI on Replit with full persistence",
   "main": "index.js",
   "bin": {

package/scripts/claude-auth-refresh.sh

@@ -3,11 +3,19 @@
 # Automatically refreshes Claude Code OAuth tokens before expiration
 # Part of DATA Tools - https://github.com/stevemoraco/DATAtools
 
-CREDENTIALS_FILE="${CLAUDE_CONFIG_DIR:-$HOME/.claude}/.credentials.json"
+# Use .replit-tools structure
+WORKSPACE="/home/runner/workspace"
+REPLIT_TOOLS="${WORKSPACE}/.replit-tools"
+CREDENTIALS_FILE="${CLAUDE_CONFIG_DIR:-${REPLIT_TOOLS}/.claude-persistent}/.credentials.json"
+LOG_FILE="${REPLIT_TOOLS}/.logs/auth-refresh.log"
+
+# OAuth configuration
 OAUTH_ENDPOINT="https://console.anthropic.com/v1/oauth/token"
 CLIENT_ID="9d1c250a-e61b-44d9-88ed-5944d1962f5e"
 REFRESH_THRESHOLD_HOURS=2  # Refresh when less than 2 hours remaining
-LOG_FILE="/home/runner/workspace/logs/auth-refresh.log"
+
+# Ensure log directory exists
+mkdir -p "${REPLIT_TOOLS}/.logs" 2>/dev/null
 
 # Logging function
 log() {

package/scripts/claude-session-manager.sh

@@ -7,7 +7,8 @@
 # =============================================================================
 
 WORKSPACE="/home/runner/workspace"
-SESSIONS_DIR="${WORKSPACE}/.claude-sessions"
+REPLIT_TOOLS="${WORKSPACE}/.replit-tools"
+SESSIONS_DIR="${REPLIT_TOOLS}/.claude-sessions"
 LOCK_DIR="/tmp/.claude-locks"
 
 mkdir -p "${SESSIONS_DIR}" "${LOCK_DIR}" 2>/dev/null

package/scripts/setup-claude-code.sh

@@ -15,12 +15,16 @@
 
 set -e
 
-# Configuration
+# Configuration - use .replit-tools structure
 WORKSPACE="/home/runner/workspace"
-CLAUDE_PERSISTENT="${CLAUDE_CONFIG_DIR:-${WORKSPACE}/.claude-persistent}"
-CLAUDE_LOCAL_SHARE="${WORKSPACE}/.local/share/claude"
-CLAUDE_VERSIONS="${CLAUDE_LOCAL_SHARE}/versions"
-AUTH_REFRESH_SCRIPT="${WORKSPACE}/scripts/claude-auth-refresh.sh"
+REPLIT_TOOLS="${WORKSPACE}/.replit-tools"
+
+# Allow env vars to override (for custom config locations)
+CLAUDE_PERSISTENT="${CLAUDE_CONFIG_DIR:-${REPLIT_TOOLS}/.claude-persistent}"
+CLAUDE_VERSIONS="${REPLIT_TOOLS}/.claude-versions"
+LOGS_DIR="${REPLIT_TOOLS}/.logs"
+SCRIPTS_DIR="${REPLIT_TOOLS}/scripts"
+AUTH_REFRESH_SCRIPT="${SCRIPTS_DIR}/claude-auth-refresh.sh"
 
 # Target locations (ephemeral, need symlinks)
 CLAUDE_SYMLINK="${HOME}/.claude"
@@ -41,7 +45,7 @@ mkdir -p "${CLAUDE_PERSISTENT}"
 mkdir -p "${CLAUDE_VERSIONS}"
 mkdir -p "${LOCAL_BIN}"
 mkdir -p "${HOME}/.local/share"
-mkdir -p "${WORKSPACE}/logs"
+mkdir -p "${LOGS_DIR}"
 
 # =============================================================================
 # Step 2: Create ~/.claude symlink for conversation history & credentials
@@ -55,10 +59,13 @@ fi
 # =============================================================================
 # Step 3: Create ~/.local/share/claude symlink for installed versions
 # =============================================================================
-if [ ! -L "${LOCAL_SHARE_CLAUDE}" ] || [ "$(readlink -f "${LOCAL_SHARE_CLAUDE}")" != "${CLAUDE_LOCAL_SHARE}" ]; then
-    rm -rf "${LOCAL_SHARE_CLAUDE}" 2>/dev/null || true
-    ln -sf "${CLAUDE_LOCAL_SHARE}" "${LOCAL_SHARE_CLAUDE}"
-    log "✅ Claude versions symlink: ~/.local/share/claude -> ${CLAUDE_LOCAL_SHARE}"
+SHARE_VERSIONS="${LOCAL_SHARE_CLAUDE}/versions"
+mkdir -p "${LOCAL_SHARE_CLAUDE}"
+
+if [ ! -L "${SHARE_VERSIONS}" ] || [ "$(readlink -f "${SHARE_VERSIONS}")" != "${CLAUDE_VERSIONS}" ]; then
+    rm -rf "${SHARE_VERSIONS}" 2>/dev/null || true
+    ln -sf "${CLAUDE_VERSIONS}" "${SHARE_VERSIONS}"
+    log "✅ Claude versions symlink: ~/.local/share/claude/versions -> ${CLAUDE_VERSIONS}"
 fi
 
 # =============================================================================
@@ -84,10 +91,13 @@ else
 
     # Install Claude Code using the official installer
     if curl -fsSL https://claude.ai/install.sh | bash 2>/dev/null; then
-        # After install, find the new version
-        if [ -d "${CLAUDE_VERSIONS}" ]; then
-            LATEST_VERSION=$(ls -1 "${CLAUDE_VERSIONS}" 2>/dev/null | grep -v '^\.' | sort -V | tail -n1)
+        # After install, copy to our versions directory
+        DEFAULT_VERSIONS="${HOME}/.local/share/claude/versions"
+        if [ -d "${DEFAULT_VERSIONS}" ]; then
+            LATEST_VERSION=$(ls -1 "${DEFAULT_VERSIONS}" 2>/dev/null | grep -v '^\.' | sort -V | tail -n1)
             if [ -n "${LATEST_VERSION}" ]; then
+                cp -p "${DEFAULT_VERSIONS}/${LATEST_VERSION}" "${CLAUDE_VERSIONS}/${LATEST_VERSION}" 2>/dev/null || true
+                chmod 755 "${CLAUDE_VERSIONS}/${LATEST_VERSION}" 2>/dev/null || true
                 ln -sf "${CLAUDE_VERSIONS}/${LATEST_VERSION}" "${LOCAL_BIN}/claude"
                 log "✅ Claude Code ${LATEST_VERSION} installed"
             fi