cliclaw 1.0.5 → 1.0.7

package/bin/cli.js

@@ -9,6 +9,13 @@ const os   = require('os')
 
 const PKG_DIR = path.resolve(__dirname, '..')
 
+// User data directory — persists across npm updates
+// Windows: %APPDATA%\cliclaw  |  others: ~/.cliclaw
+const USER_DIR = process.env.CLICLAW_DIR ||
+  (os.platform() === 'win32'
+    ? path.join(process.env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming'), 'cliclaw')
+    : path.join(os.homedir(), '.cliclaw'))
+
 // ─── colors ──────────────────────────────────────────────────────────────────
 const c = {
   reset:'\x1b[0m', bold:'\x1b[1m', cyan:'\x1b[36m',
@@ -154,10 +161,14 @@ async function cmdSetup() {
 
 // ─── config wizard ────────────────────────────────────────────────────────────
 async function runConfigWizard() {
-  const envFile = path.join(PKG_DIR, '.env')
+  if (!fs.existsSync(USER_DIR)) fs.mkdirSync(USER_DIR, { recursive: true })
+  const envFile = path.join(USER_DIR, '.env')
   const existing = {}
-  if (fs.existsSync(envFile)) {
-    fs.readFileSync(envFile, 'utf8').split('\n').forEach(l => {
+  // Also check legacy pkg-dir .env for migration
+  const legacyEnv = path.join(PKG_DIR, '.env')
+  const srcEnv = fs.existsSync(envFile) ? envFile : (fs.existsSync(legacyEnv) ? legacyEnv : null)
+  if (srcEnv) {
+    fs.readFileSync(srcEnv, 'utf8').split('\n').forEach(l => {
       const [k, ...v] = l.split('=')
       if (k && v.length) existing[k.trim()] = v.join('=').trim()
     })
@@ -187,20 +198,21 @@ async function runConfigWizard() {
   const permMode = permChoice === '2' ? 'session' : permChoice === '3' ? 'ask' : 'auto'
   ok(`Permission mode: ${permMode}`)
 
-  const dataDir = path.join(PKG_DIR, 'data')
+  const dataDir = existing.DATA_DIR || path.join(USER_DIR, 'data')
   let envContent = `TELEGRAM_BOT_TOKEN=${token}\n`
   if (forumId) envContent += `FORUM_GROUP_ID=${forumId}\n`
   envContent += `PERMISSION_MODE=${permMode}\n`
   envContent += `DATA_DIR=${dataDir}\n`
   fs.writeFileSync(envFile, envContent, 'utf8')
-  ok(`.env saved`)
+  ok(`.env saved → ${envFile}`)
 }
 
 // ─── config (open .env in editor) ────────────────────────────────────────────
 function cmdConfig() {
-  const envFile = path.join(PKG_DIR, '.env')
+  const envFile = path.join(USER_DIR, '.env')
   if (!fs.existsSync(envFile)) {
-    warn('.env not found. Run: cliclaw setup')
+    warn(`.env not found at ${envFile}`)
+    warn('Run: cliclaw setup')
     process.exit(1)
   }
   const platform = os.platform()

package/ecosystem.config.js

@@ -17,6 +17,7 @@ module.exports = {
     },
     watch: false,
     autorestart: true,
+    restart_delay: 5000,
     max_memory_restart: '300M',
     error_file: path.join(__dirname, 'logs/error.log'),
     out_file:   path.join(__dirname, 'logs/out.log'),

package/index.ts

@@ -25,4 +25,13 @@ if (config.FORUM_GROUP_ID) {
 
 bot.start({
   onStart: (info) => console.log(`✅ Bot @${info.username} online!`),
+}).catch(async (e) => {
+  const code = (e as any)?.error_code ?? (e as any)?.code
+  if (code === 409) {
+    console.warn('⚠️  409 Conflict — outra instância ativa. Aguardando 35s para o long-poll expirar...')
+    await new Promise(r => setTimeout(r, 35_000))
+  } else {
+    console.error('[OpenClaw] Erro fatal:', e)
+  }
+  process.exit(1)
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cliclaw",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Telegram bot bridging AI CLIs (Claude Code, Codex) to Forum Topics",
   "main": "index.ts",
   "scripts": {

package/src/config.ts

@@ -1,6 +1,7 @@
-import { existsSync, readFileSync } from 'fs'
+import { existsSync, readFileSync, mkdirSync } from 'fs'
 import { execSync } from 'child_process'
 import { join } from 'path'
+import { homedir } from 'os'
 
 export type AgentName = 'claude' | 'codex'
 export type PermissionMode = 'auto' | 'session' | 'ask'
@@ -14,8 +15,14 @@ export interface Config {
   availableAgents: AgentName[]
 }
 
-// Resolve package root relative to this file (works for global npm install too)
-// src/config.ts is 1 level below package root
+// User data directory — persists across npm updates
+// Windows: %APPDATA%\cliclaw   |   others: ~/.cliclaw
+export const USER_DIR = process.env.CLICLAW_DIR ||
+  (process.platform === 'win32'
+    ? join(process.env.APPDATA || join(homedir(), 'AppData', 'Roaming'), 'cliclaw')
+    : join(homedir(), '.cliclaw'))
+
+// Legacy: package root .env (used before 1.0.6)
 const PKG_ROOT = join(__dirname, '..')
 
 function checkAgents(): AgentName[] {
@@ -31,8 +38,9 @@ function checkAgents(): AgentName[] {
 }
 
 export function loadConfig(): Config {
-  // CLICLAW_ENV env var allows override; otherwise resolves to <pkg-root>/.env
-  const envFile = process.env.CLICLAW_ENV || join(PKG_ROOT, '.env')
+  // Resolution order: CLICLAW_ENV → USER_DIR/.env → PKG_ROOT/.env (legacy)
+  const envFile = process.env.CLICLAW_ENV ||
+    (existsSync(join(USER_DIR, '.env')) ? join(USER_DIR, '.env') : join(PKG_ROOT, '.env'))
   if (existsSync(envFile)) {
     const content = readFileSync(envFile, 'utf-8')
     for (const line of content.split('\n')) {
@@ -53,7 +61,7 @@ export function loadConfig(): Config {
 
   const config: Config = {
     TELEGRAM_BOT_TOKEN: process.env.TELEGRAM_BOT_TOKEN || '',
-    DATA_DIR:           process.env.DATA_DIR || join(PKG_ROOT, 'data'),
+    DATA_DIR:           process.env.DATA_DIR || join(USER_DIR, 'data'),
     FORUM_GROUP_ID:     process.env.FORUM_GROUP_ID || '',
     TELEGRAM_ADMIN_IDS: (process.env.TELEGRAM_ADMIN_IDS || '')
       .split(',').map(id => id.trim()).filter(Boolean),
@@ -62,7 +70,11 @@ export function loadConfig(): Config {
   }
 
   if (!config.TELEGRAM_BOT_TOKEN) {
-    throw new Error(`TELEGRAM_BOT_TOKEN not set in .env (looked at: ${envFile})`)
+    throw new Error(
+      `TELEGRAM_BOT_TOKEN not set.\n` +
+      `Run: cliclaw setup\n` +
+      `Or create: ${join(USER_DIR, '.env')} with TELEGRAM_BOT_TOKEN=<token>`
+    )
   }
 
   if (config.availableAgents.length === 0) {