cliclaw 1.0.15 → 1.0.17

package/package.json

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

package/src/agents/codex.ts

@@ -1,5 +1,5 @@
 import { spawn } from 'child_process'
-import type { Session } from '../storage'
+import type { Session, Message } from '../storage'
 import type { TokenUsage } from './claude'
 
 const HOME = process.env.HOME || process.env.USERPROFILE || '/root'
@@ -16,26 +16,40 @@ const BASE_ENV = {
 }
 
 function extractTextFromObj(obj: any): string | null {
-  // Format 1: item.completed with agent_message
+  // New codex format: {"id":"...","msg":{"type":"agent_message","text":"..."}}
+  if (obj.msg?.type === 'agent_message' && obj.msg?.text) return obj.msg.text
+  // Old format: item.completed with agent_message
   if (obj.type === 'item.completed' && obj.item?.type === 'agent_message' && obj.item?.text)
     return obj.item.text
-  // Format 2: response.output_item.done with message content array
+  // OpenAI Responses API: response.output_item.done with message content array
   if (obj.item?.type === 'message' && Array.isArray(obj.item?.content)) {
     const parts = obj.item.content
       .filter((c: any) => c.type === 'output_text' && c.text)
       .map((c: any) => c.text)
     if (parts.length > 0) return parts.join('')
   }
-  // Format 3: top-level result/output/text
+  // Fallback: top-level result/output
   if (typeof obj.result === 'string' && obj.result) return obj.result
   if (typeof obj.output === 'string' && obj.output) return obj.output
-  if (typeof obj.text === 'string' && obj.text && obj.type !== 'thread.started') return obj.text
-  // Format 4: message with content string
-  if (obj.type === 'message' && typeof obj.content === 'string' && obj.content) return obj.content
   return null
 }
 
-function spawnCodex(args: string[]): Promise<{ text: string; threadId: string | null; usage?: TokenUsage }> {
+function buildPrompt(history: Message[], userMessage: string): string {
+  // history already contains the current user message as the last item (added before askCodex)
+  const prior = history.slice(0, -1).slice(-20)  // up to last 20 prior messages
+  if (prior.length === 0) return userMessage
+  const lines = prior.map(m => {
+    let content = m.content
+    // Strip usage stats suffix (e.g. "\n`📊 ↑1234 ↓56`")
+    const usageIdx = content.lastIndexOf('\n`📊')
+    if (usageIdx > 0) content = content.slice(0, usageIdx)
+    if (content.length > 600) content = content.slice(0, 600) + '…'
+    return `${m.role === 'user' ? 'User' : 'Assistant'}: ${content}`
+  })
+  return `<conversation_history>\n${lines.join('\n')}\n</conversation_history>\n\nUser: ${userMessage}`
+}
+
+function spawnCodex(args: string[], stdinText?: string): Promise<{ text: string; threadId: string | null; usage?: TokenUsage }> {
   return new Promise((resolve, reject) => {
     let stdout = ''
     let stderr = ''
@@ -45,8 +59,12 @@ function spawnCodex(args: string[]): Promise<{ text: string; threadId: string |
       cwd: process.cwd(),
       shell: isWin,
       windowsHide: true,
-      stdio: ['ignore', 'pipe', 'pipe'],  // explicit: ignore stdin so headless PM2 doesn't hang
+      // Use pipe for stdin when we have text to send; otherwise ignore to prevent PM2 hang
+      stdio: [stdinText != null ? 'pipe' : 'ignore', 'pipe', 'pipe'],
     })
+    if (stdinText != null) {
+      proc.stdin!.end(stdinText, 'utf8')
+    }
     proc.stdout.on('data', (d: Buffer) => { stdout += d.toString() })
     proc.stderr.on('data', (d: Buffer) => {
       const s = d.toString().trim()
@@ -102,12 +120,12 @@ export async function askCodex(
   onNewThreadId?: (id: string) => void
 ): Promise<{ text: string; usage?: TokenUsage }> {
   try {
-    const codexThreadId = session.codexThreadId
-    const args = codexThreadId
-      ? ['exec', 'resume', codexThreadId, '--dangerously-bypass-approvals-and-sandbox', '--skip-git-repo-check', '--json', userMessage]
-      : ['exec', '--dangerously-bypass-approvals-and-sandbox', '--skip-git-repo-check', '--json', userMessage]
-    const { text, threadId, usage } = await spawnCodex(args)
-    if (threadId && !codexThreadId) onNewThreadId?.(threadId)
+    // Build full prompt with conversation history, send via stdin (avoids Windows arg escaping issues)
+    const prompt = buildPrompt(session.history, userMessage)
+    // `-` tells codex exec to read PROMPT from stdin
+    const args = ['exec', '--dangerously-bypass-approvals-and-sandbox', '--skip-git-repo-check', '--json', '-']
+    const { text, threadId, usage } = await spawnCodex(args, prompt)
+    if (threadId && !session.codexThreadId) onNewThreadId?.(threadId)
     return { text, usage }
   } catch (err: any) {
     return { text: `❌ Codex error: ${err.message}` }