cliclaw 1.0.7 → 1.0.9

package/bin/cli.js

@@ -355,7 +355,21 @@ const [,, cmd = 'help'] = process.argv
 switch (cmd) {
   case 'setup':   cmdSetup().catch(e => { err(e.message); process.exit(1) }); break
   case 'config':  cmdConfig(); break
-  case 'start':   cmdPm2(['start', path.join(PKG_DIR, 'ecosystem.config.js')]); break
+  case 'start': {
+    process.chdir(PKG_DIR)
+    // If the process exists in PM2 but is broken, restart it; otherwise start fresh
+    let exists = false
+    try {
+      const jlist = JSON.parse(require('child_process').execSync('pm2 jlist', { stdio: 'pipe', encoding: 'utf8' }))
+      exists = jlist.some(p => p.name === 'cliclaw')
+    } catch {}
+    if (exists) {
+      spawnSync('pm2', ['restart', 'cliclaw', '--update-env'], { stdio: 'inherit', shell: true })
+    } else {
+      spawnSync('pm2', ['start', path.join(PKG_DIR, 'ecosystem.config.js')], { stdio: 'inherit', shell: true })
+    }
+    break
+  }
   case 'stop':    cmdPm2(['stop', 'cliclaw']); break
   case 'restart': cmdPm2(['restart', 'cliclaw', '--update-env']); break
   case 'status':  cmdPm2(['status']); break

package/package.json

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

package/src/agents/claude.ts

@@ -10,12 +10,17 @@ export interface TokenUsage {
   costUsd?: number
 }
 
-const HOME = process.env.HOME || '/root'
+const HOME = process.env.HOME || process.env.USERPROFILE || '/root'
+const SEP = process.platform === 'win32' ? ';' : ':'
 
 function buildEnv() {
   const e: Record<string, string> = {
     ...process.env as any,
-    PATH: `${HOME}/.npm-global/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`,
+    PATH: [
+      process.env.PATH || '',
+      `${HOME}/.npm-global/bin`,
+      '/usr/local/bin', '/usr/bin', '/bin',
+    ].filter(Boolean).join(SEP),
     HOME,
     LANG: 'en_US.UTF-8',
   }

package/src/agents/codex.ts

@@ -2,9 +2,15 @@ import { spawn } from 'child_process'
 import type { Session } from '../storage'
 import type { TokenUsage } from './claude'
 
-const HOME = process.env.HOME || '/root'
+const HOME = process.env.HOME || process.env.USERPROFILE || '/root'
+const SEP = process.platform === 'win32' ? ';' : ':'
+// Keep system PATH (contains npm global bin) and append Linux fallbacks for non-Windows
 const BASE_ENV = {
-  PATH: `${HOME}/.npm-global/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`,
+  PATH: [
+    process.env.PATH || '',
+    `${HOME}/.npm-global/bin`,
+    '/usr/local/bin', '/usr/bin', '/bin',
+  ].filter(Boolean).join(SEP),
   HOME,
   LANG: 'en_US.UTF-8',
 }

package/src/i18n.ts

@@ -2,10 +2,10 @@ import type { Context } from 'grammy'
 
 export type Lang = 'pt' | 'en'
 
-/** Detect language from Telegram user locale. Defaults to 'en'. */
+/** Detect language from Telegram user locale. Defaults to 'pt'. */
 export function getLang(ctx: Context): Lang {
   const code = ctx.from?.language_code ?? ''
-  return code.startsWith('pt') ? 'pt' : 'en'
+  return code.startsWith('en') ? 'en' : 'pt'
 }
 
 const strings = {