thepopebot 1.2.75-beta.10 → 1.2.75-beta.12

package/README.md

@@ -106,7 +106,7 @@ The wizard walks you through everything:
 - **Web Chat**: Visit your APP_URL to chat with your agent, create jobs, upload files
 - **Telegram** (optional): Run `npm run setup-telegram` to connect a Telegram bot
 - **Webhook**: Send a POST to `/api/create-agent-job` with your API key to create jobs programmatically
-- **Cron**: Edit `config/CRONS.json` to schedule recurring jobs
+- **Cron**: Edit `agent-job/CRONS.json` to schedule recurring jobs
 
 ### Chat vs Agent LLM
 

package/bin/CLAUDE.md

@@ -21,7 +21,7 @@ Entry point: `cli.js` (invoked via `npx thepopebot <command>`).
 
 `managed-paths.js` defines files auto-synced by `init`. These are overwritten on every init/upgrade — users should not edit them.
 
-**Managed paths**: `.github/workflows/`, `docker-compose.yml`, `.dockerignore`, `.gitignore`, `CLAUDE.md`, `config/CLAUDE.md`, `skills/CLAUDE.md`, `cron/CLAUDE.md`, `triggers/CLAUDE.md`, `docs/CLAUDE.md`.
+**Managed paths**: `.github/workflows/`, `docker-compose.yml`, `.dockerignore`, `.gitignore`, `agent-job/CLAUDE.md`, `event-handler/CLAUDE.md`, `skills/CLAUDE.md`.
 
 `isManaged(relPath)` — returns true if a path is managed (exact match or directory prefix).
 

package/bin/cli.js

@@ -385,7 +385,7 @@ function reset(filePath) {
       console.log(`  ${destPath(file)}`);
     }
     console.log('\nUsage: thepopebot reset <file>');
-    console.log('Example: thepopebot reset config/SOUL.md\n');
+    console.log('Example: thepopebot reset agent-job/SOUL.md\n');
     return;
   }
 
@@ -442,7 +442,7 @@ function diff(filePath) {
       console.log('  All files match package templates.');
     }
     console.log('\nUsage: thepopebot diff <file>');
-    console.log('Example: thepopebot diff config/SOUL.md\n');
+    console.log('Example: thepopebot diff agent-job/SOUL.md\n');
     return;
   }
 

package/bin/managed-paths.js

@@ -8,12 +8,9 @@ export const MANAGED_PATHS = [
   'docker-compose.yml',
   '.dockerignore',
   '.gitignore',
-  'CLAUDE.md',
-  'config/CLAUDE.md',
+  'agent-job/CLAUDE.md',
+  'event-handler/CLAUDE.md',
   'skills/CLAUDE.md',
-  'cron/CLAUDE.md',
-  'triggers/CLAUDE.md',
-  'docs/',
 ];
 
 export function isManaged(relPath) {

package/config/CLAUDE.md

@@ -1,32 +1,4 @@
-# config/ — Configuration Files
-
-## Directory Structure
-
-```
-config/
-├── agent-chat/
-│   └── SYSTEM.md              # Agent chat system prompt (supports {{skills}}, {{datetime}})
-├── code-chat/
-│   └── SYSTEM.md              # Code workspace system prompt
-├── agent-job/
-│   ├── SOUL.md                # Agent personality/identity (used by Docker agent)
-│   ├── AGENT_JOB.md           # Agent runtime environment docs (used by Docker agent)
-│   └── SUMMARY.md             # Prompt for summarizing completed jobs
-├── cluster/
-│   ├── SYSTEM.md              # Cluster worker system prompt
-│   └── ROLE.md                # Per-role prompt template for cluster workers
-├── HEARTBEAT.md               # Self-monitoring behavior (cron task prompt)
-├── CRONS.json                 # Scheduled job definitions
-└── TRIGGERS.json              # Webhook trigger definitions
-```
-
-## Markdown File Includes
-
-Markdown files in `config/` support includes and built-in variables, powered by `lib/utils/render-md.js`.
-
-- **File includes**: `{{ filepath.md }}` — resolves relative to project root, recursive with circular detection. Missing files are left as-is.
-- **`{{datetime}}`** — Current ISO timestamp.
-- **`{{skills}}`** — Dynamic bullet list of active skill descriptions from `skills/active/*/SKILL.md` frontmatter. Never hardcode skill names — this is resolved at runtime.
+# config/ — Next.js Config Wrapper
 
 ## Next.js Config Wrapper (index.js)
 

package/lib/CLAUDE.md

@@ -12,16 +12,16 @@ If the task needs to *think*, use `agent`. If it just needs to *do*, use `comman
 
 **Agent**: Creates a Docker Agent job via `createAgentJob()`. Pushes an `agent-job/*` branch and launches a local Docker container. The `job` string is the LLM task prompt. Agent backend selected via `agent_backend` in `agent-job.config.json`.
 
-**Command**: Runs a shell command on the event handler. Working directory: `cron/` for crons, `triggers/` for triggers.
+**Command**: Runs a shell command on the event handler. Working directory: project root.
 
 **Webhook**: Makes an HTTP request. `GET` skips the body; `POST` (default) sends `{ ...vars }` or `{ ...vars, data: <payload> }`.
 
 ## Cron Jobs
 
-Defined in `config/CRONS.json`, loaded by `lib/cron.js` at startup via `node-cron`. Each entry has `name`, `schedule` (cron expression), `type` (`agent`/`command`/`webhook`), and the corresponding action fields (`job`, `command`, or `url`/`method`/`headers`/`vars`). Set `enabled: false` to disable. Agent-type entries support optional `llm_provider` and `llm_model` fields to override the default LLM (passed to Docker agent via `agent-job.config.json`).
+Defined in `agent-job/CRONS.json`, loaded by `lib/cron.js` at startup via `node-cron`. Each entry has `name`, `schedule` (cron expression), `type` (`agent`/`command`/`webhook`), and the corresponding action fields (`job`, `command`, or `url`/`method`/`headers`/`vars`). Set `enabled: false` to disable. Agent-type entries support optional `llm_provider` and `llm_model` fields to override the default LLM (passed to Docker agent via `agent-job.config.json`).
 
 ## Webhook Triggers
 
-Defined in `config/TRIGGERS.json`, loaded by `lib/triggers.js`. Each trigger watches an endpoint path (`watch_path`) and fires an array of actions (fire-and-forget, after auth, before route handler). Actions use the same `type`/`job`/`command`/`url` fields as cron jobs, including optional `llm_provider`/`llm_model` overrides.
+Defined in `event-handler/TRIGGERS.json`, loaded by `lib/triggers.js`. Each trigger watches an endpoint path (`watch_path`) and fires an array of actions (fire-and-forget, after auth, before route handler). Actions use the same `type`/`job`/`command`/`url` fields as cron jobs, including optional `llm_provider`/`llm_model` overrides.
 
 Template tokens in `job` and `command` strings: `{{body}}`, `{{body.field}}`, `{{query}}`, `{{query.field}}`, `{{headers}}`, `{{headers.field}}`.

package/lib/ai/CLAUDE.md

@@ -5,12 +5,12 @@
 Two agent singletons, both using `createReactAgent` from `@langchain/langgraph/prebuilt` with `SqliteSaver` for conversation memory:
 
 **Agent Chat** — singleton via `getAgentChat()`:
-- System prompt: `config/agent-chat/SYSTEM.md` (rendered fresh each invocation via `render_md()`)
+- System prompt: `event-handler/agent-chat/SYSTEM.md` (rendered fresh each invocation via `render_md()`)
 - Tools: `agent_job`, `coding_agent`
 - Call `resetAgentChats()` to clear both singletons (required if hot-reloading)
 
 **Code Chat** — singleton via `getCodeChat()`:
-- System prompt: `config/code-chat/SYSTEM.md` (rendered fresh each invocation)
+- System prompt: `event-handler/code-chat/SYSTEM.md` (rendered fresh each invocation)
 - Tools: `coding_agent` (reads repo/branch/workspace from `runtime.configurable`)
 
 ## Adding a New Tool
@@ -73,7 +73,28 @@ Three-layer parser for Claude Code agents running in headless Docker containers:
 3. **Event mapper** (`mapLine()`) — Converts each line to chat events:
    - `assistant` messages: `text` blocks → `{ type: 'text' }`, `tool_use` blocks → `{ type: 'tool-call' }`
    - `user` messages: `tool_result` blocks → `{ type: 'tool-result' }` (priority: stdout > string content > array)
-   - `result` messages: → `{ type: 'text', _resultSummary }` (injected into LangGraph memory)
+   - `result` messages: → `{ type: 'text' }` (final summary from the agent)
    - Non-JSON lines (e.g. `NO_CHANGES`, `AGENT_FAILED`): wrapped as plain text events
 
 `parseHeadlessStream(dockerLogStream)` is an async generator consuming `http.IncomingMessage`. `mapLine()` is also reused by `lib/cluster/stream.js` for worker log parsing.
+
+### Tool Return Format
+
+The `coding_agent` tool (in `tools.js`) returns the **full container session** as a flat JSON array. This becomes the ToolMessage in LangGraph's checkpoint, giving the LLM complete context on the current turn. The array contains:
+
+- `{ type: 'meta', codingAgent, backendApi }` — first event, agent identity
+- `{ type: 'text', text }` — agent text output
+- `{ type: 'tool-call', toolCallId, toolName, args }` — agent tool invocations
+- `{ type: 'tool-result', toolCallId, result }` — tool execution results
+- `{ type: 'exit', exitCode }` — last event, container exit status
+
+On error before streaming starts: `[{ type: 'error', message }]`.
+
+### Adding a New Agent Mapper (line-mappers.js)
+
+Each coding agent CLI has its own mapper function (`mapClaudeCodeLine`, `mapPiLine`, `mapGeminiLine`, `mapCodexLine`, `mapOpenCodeLine`, `mapKimiLine`). When adding a new agent:
+
+1. Create `mapXxxLine(parsed)` in `line-mappers.js` that returns an array of `{ type, ... }` events
+2. Register it in `headless-stream.js`: add to imports, re-exports, and the `mapperMap` object
+3. Map the agent's JSON output to three event types: `{ type: 'text', text }`, `{ type: 'tool-call', toolCallId, toolName, args }`, `{ type: 'tool-result', toolCallId, result }`
+4. Return `[{ type: 'skip' }]` for noise events (session init, rate limits, etc.) to suppress them without triggering the unknown fallback

package/lib/ai/agent.js

@@ -3,7 +3,8 @@ import { SystemMessage } from '@langchain/core/messages';
 import { createModel } from './model.js';
 import { agentJobTool, agentChatCodingTool, codeChatCodingTool } from './tools.js';
 import { SqliteSaver } from '@langchain/langgraph-checkpoint-sqlite';
-import { agentJobPlanningMd, codePlanningMd, thepopebotDb } from '../paths.js';
+import path from 'path';
+import { PROJECT_ROOT } from '../paths.js';
 import { render_md } from '../utils/render-md.js';
 
 // Singletons on globalThis to survive Next.js webpack chunk duplication.
@@ -20,13 +21,14 @@ export async function getAgentChat() {
     const model = await createModel();
     const tools = [agentJobTool, agentChatCodingTool];
 
-    const checkpointer = SqliteSaver.fromConnString(thepopebotDb);
+    const dbPath = process.env.DATABASE_PATH || path.join(PROJECT_ROOT, 'data/db/thepopebot.sqlite');
+    const checkpointer = SqliteSaver.fromConnString(dbPath);
 
     globalThis.__popebotAgentChat = createReactAgent({
       llm: model,
       tools,
       checkpointSaver: checkpointer,
-      prompt: (state) => [new SystemMessage(render_md(agentJobPlanningMd)), ...state.messages],
+      prompt: (state) => [new SystemMessage(render_md(path.join(PROJECT_ROOT, 'event-handler/agent-chat/SYSTEM.md'))), ...state.messages],
     });
   }
   return globalThis.__popebotAgentChat;
@@ -41,13 +43,14 @@ export async function getCodeChat() {
     const model = await createModel();
     const tools = [codeChatCodingTool];
 
-    const checkpointer = SqliteSaver.fromConnString(thepopebotDb);
+    const dbPath = process.env.DATABASE_PATH || path.join(PROJECT_ROOT, 'data/db/thepopebot.sqlite');
+    const checkpointer = SqliteSaver.fromConnString(dbPath);
 
     globalThis.__popebotCodeChat = createReactAgent({
       llm: model,
       tools,
       checkpointSaver: checkpointer,
-      prompt: (state) => [new SystemMessage(render_md(codePlanningMd)), ...state.messages],
+      prompt: (state) => [new SystemMessage(render_md(path.join(PROJECT_ROOT, 'event-handler/code-chat/SYSTEM.md'))), ...state.messages],
     });
   }
   return globalThis.__popebotCodeChat;

package/lib/ai/headless-stream.js

@@ -10,6 +10,7 @@ export {
   mapGeminiLine,
   mapCodexLine,
   mapOpenCodeLine,
+  mapKimiLine,
 } from './line-mappers.js';
 
 import {
@@ -19,6 +20,7 @@ import {
   mapGeminiLine,
   mapCodexLine,
   mapOpenCodeLine,
+  mapKimiLine,
 } from './line-mappers.js';
 
 /**
@@ -41,6 +43,7 @@ export async function* parseHeadlessStream(dockerLogStream, codingAgent = 'claud
     'gemini-cli': mapGeminiLine,
     'codex-cli': mapCodexLine,
     'opencode': mapOpenCodeLine,
+    'kimi-cli': mapKimiLine,
   };
   const mapper = mapperMap[codingAgent] || mapClaudeCodeLine;
 

package/lib/ai/index.js

@@ -1,9 +1,10 @@
-import { HumanMessage, AIMessage } from '@langchain/core/messages';
+import { HumanMessage } from '@langchain/core/messages';
 import { createChannel, mergeAsyncIterables } from './async-channel.js';
 import { z } from 'zod';
 import { getAgentChat, getCodeChat } from './agent.js';
 import { createModel } from './model.js';
-import { agentJobSummaryMd } from '../paths.js';
+import path from 'path';
+import { PROJECT_ROOT } from '../paths.js';
 import { render_md } from '../utils/render-md.js';
 import { getChatById, createChat, saveMessage, updateChatTitle, linkChatToWorkspace } from '../db/chats.js';
 
@@ -192,7 +193,6 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
       { configurable: { thread_id: threadId, workspaceId, repo, branch, codeModeType, streamCallback }, streamMode: 'messages' }
     );
 
-    let fullText = '';
     const toolCallNames = {};
     const pendingToolCalls = new Map();
 
@@ -205,11 +205,9 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
     const toolCallArgsEmitted = new Set(); // tool_call_ids whose complete args have been yielded
 
     // Headless container streaming state
-    const memoryParts = [];
     const headlessPendingToolCalls = new Map();
     let pendingText = '';       // channel text, flushed to DB at tool boundaries
     let llmTextAccum = '';      // langgraph text (direct response or LLM follow-up after container)
-    let resultSummary = '';
 
     // Tag helper so mergeAsyncIterables can tell the two sources apart.
     // The LangGraph wrapper also closes sideChannel when the agent stream
@@ -284,7 +282,6 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
             }
 
             if (text) {
-              fullText += text;
               llmTextAccum += text;
               yield { type: 'text', text };
             }
@@ -321,20 +318,9 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
 
         } else {
           // ── Side channel: headless container chunks ───────────────────────
-          let chunk = item;
-
-          // Result summary: skip if duplicate, otherwise ensure it starts on a new line
-          if (chunk._resultSummary && chunk.type === 'text') {
-            resultSummary = chunk._resultSummary;
-            if (pendingText.trim() && chunk.text.trim() === pendingText.trim()) {
-              continue;
-            }
-            chunk = { ...chunk, text: '\n\n' + chunk.text };
-          }
+          const chunk = item;
 
           if (chunk.type === 'text') {
-            fullText += chunk.text;
-            memoryParts.push(chunk.text);
             pendingText += chunk.text;
             yield chunk;
           } else if (chunk.type === 'tool-call') {
@@ -343,7 +329,6 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
               persistMessage(threadId, 'assistant', pendingText, options);
               pendingText = '';
             }
-            memoryParts.push('[tool-call] ' + chunk.toolName + ': ' + JSON.stringify(chunk.args));
             headlessPendingToolCalls.set(chunk.toolCallId, { toolName: chunk.toolName, args: chunk.args });
             yield chunk;
           } else if (chunk.type === 'tool-result') {
@@ -351,7 +336,6 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
             const htc = headlessPendingToolCalls.get(chunk.toolCallId);
             const enriched = htc ? { ...chunk, args: htc.args, toolName: htc.toolName } : chunk;
             yield enriched;
-            memoryParts.push('[tool-result] ' + chunk.result);
             if (htc) {
               persistMessage(threadId, 'assistant', JSON.stringify({
                 type: 'tool-invocation',
@@ -364,11 +348,9 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
               headlessPendingToolCalls.delete(chunk.toolCallId);
             }
           } else {
-            // unknown events pass through unchanged
+            // unknown/meta events pass through unchanged
             yield chunk;
           }
-
-          if (chunk._resultSummary) resultSummary = chunk._resultSummary;
         }
       }
     } finally {
@@ -386,14 +368,6 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
       persistMessage(threadId, 'assistant', llmTextAccum, options);
     }
 
-    // Inject full headless conversation detail into LangGraph memory for follow-up turns
-    if (memoryParts.length > 0) {
-      await agent.updateState(
-        { configurable: { thread_id: threadId } },
-        { messages: [new AIMessage(memoryParts.join('\n'))] }
-      );
-    }
-
   } catch (err) {
     console.error('[chatStream] error:', err);
     throw err;
@@ -435,10 +409,11 @@ async function autoTitle(threadId, firstMessage) {
 async function summarizeAgentJob(results) {
   try {
     const model = await createModel({ maxTokens: 1024 });
-    const systemPrompt = render_md(agentJobSummaryMd);
+    const summaryMdPath = path.join(PROJECT_ROOT, 'event-handler/SUMMARY.md');
+    const systemPrompt = render_md(summaryMdPath);
 
     if (!systemPrompt) {
-      console.error(`[summarizeAgentJob] Empty system prompt — agent-job/SUMMARY.md not found or empty at: ${agentJobSummaryMd}`);
+      console.error(`[summarizeAgentJob] Empty system prompt — event-handler/SUMMARY.md not found or empty at: ${summaryMdPath}`);
     }
 
     const userMessage = [

package/lib/ai/line-mappers.js

@@ -107,7 +107,7 @@ export function mapClaudeCodeLine(parsed) {
     // User messages without tool_result (e.g. subagent prompts) — skip
     if (events.length === 0) return [{ type: 'skip' }];
   } else if (type === 'result' && result) {
-    events.push({ type: 'text', text: result, _resultSummary: result });
+    events.push({ type: 'text', text: result });
   }
 
   return events;
@@ -176,7 +176,7 @@ export function mapPiLine(parsed) {
         .map(b => b.text)
         .join('');
       if (text) {
-        events.push({ type: 'text', text, _resultSummary: text });
+        events.push({ type: 'text', text });
       }
     }
   }
@@ -233,7 +233,7 @@ export function mapGeminiLine(parsed) {
     const stats = parsed.stats;
     if (stats) {
       const summary = `Completed (${stats.total_tokens || 0} tokens, ${stats.tool_calls || 0} tool calls, ${((stats.duration_ms || 0) / 1000).toFixed(1)}s)`;
-      events.push({ type: 'text', text: summary, _resultSummary: summary });
+      events.push({ type: 'text', text: summary });
     }
     return events.length ? events : [{ type: 'skip' }];
   } else if (type === 'error') {
@@ -245,6 +245,74 @@ export function mapGeminiLine(parsed) {
   return events;
 }
 
+// ─────────────────────────────────────────────────────────────────────────────
+// Kimi CLI: OpenAI-style function calling JSON
+//
+// Event shapes (from real output):
+//   role: "assistant", content: [], tool_calls: [{ type: "function", id, function: { name, arguments } }]
+//   role: "assistant", content: "text..." (with or without tool_calls)
+//   role: "tool", content: "...", tool_call_id: "..."
+// ─────────────────────────────────────────────────────────────────────────────
+
+/**
+ * Map a Kimi CLI line to chat events.
+ * @param {object} parsed - Parsed JSON object
+ * @returns {Array<object>}
+ */
+export function mapKimiLine(parsed) {
+  const events = [];
+  const { role, content, tool_calls, tool_call_id } = parsed;
+
+  if (role === 'assistant') {
+    // Text content — can be a string or an array of blocks
+    if (typeof content === 'string' && content) {
+      events.push({ type: 'text', text: content });
+    } else if (Array.isArray(content)) {
+      for (const block of content) {
+        if (typeof block === 'string' && block) {
+          events.push({ type: 'text', text: block });
+        } else if (block?.type === 'text' && block.text) {
+          events.push({ type: 'text', text: block.text });
+        }
+      }
+    }
+
+    // Tool calls — OpenAI function calling format
+    if (Array.isArray(tool_calls)) {
+      for (const tc of tool_calls) {
+        if (tc.type === 'function' && tc.function) {
+          let args = {};
+          try {
+            args = typeof tc.function.arguments === 'string'
+              ? JSON.parse(tc.function.arguments)
+              : tc.function.arguments || {};
+          } catch { /* leave as empty object */ }
+          events.push({
+            type: 'tool-call',
+            toolCallId: tc.id || '',
+            toolName: tc.function.name || '',
+            args,
+          });
+        }
+      }
+    }
+
+    // Assistant message with only empty content and no tool calls — skip
+    if (events.length === 0) return [{ type: 'skip' }];
+  } else if (role === 'tool') {
+    const resultText = typeof content === 'string' ? content :
+      Array.isArray(content) ? content.map(b => (typeof b === 'string' ? b : b?.text || '')).join('') :
+      JSON.stringify(content);
+    events.push({
+      type: 'tool-result',
+      toolCallId: tool_call_id || '',
+      result: resultText,
+    });
+  }
+
+  return events;
+}
+
 // ─────────────────────────────────────────────────────────────────────────────
 // Codex CLI: --json
 //
@@ -312,7 +380,7 @@ export function mapCodexLine(parsed) {
     const usage = parsed.usage;
     if (usage) {
       const summary = `Completed (${usage.input_tokens || 0} input, ${usage.output_tokens || 0} output tokens)`;
-      events.push({ type: 'text', text: summary, _resultSummary: summary });
+      events.push({ type: 'text', text: summary });
     }
     return events.length ? events : [{ type: 'skip' }];
   } else if (type === 'turn.failed') {
@@ -350,11 +418,6 @@ export function mapOpenCodeLine(parsed) {
   // Text output — part.text contains the assistant's response
   if (type === 'text' && part?.text) {
     events.push({ type: 'text', text: part.text });
-    // If step_finish follows with reason "stop", this is the final answer
-    // We mark it as result summary so it gets captured in LangGraph memory
-    if (part.text.length > 50) {
-      events[events.length - 1]._resultSummary = part.text;
-    }
   }
 
   // Tool use — OpenCode emits a single event with completed state (input + output)

package/lib/ai/tools.js

@@ -55,7 +55,7 @@ const agentChatCodingTool = tool(
       const containerName = `${codingAgent}-headless-${randomUUID().slice(0, 8)}`;
 
       const { runHeadlessContainer, tailContainerLogs, waitForContainer, removeContainer } = await import('../tools/docker.js');
-      await runHeadlessContainer({
+      const { backendApi } = await runHeadlessContainer({
         containerName,
         repo,
         branch: 'main',
@@ -66,14 +66,14 @@ const agentChatCodingTool = tool(
         injectSecrets: true,
       });
 
+      const chunks = [{ type: 'meta', codingAgent, backendApi }];
       const streamCallback = runtime.configurable.streamCallback;
       const { parseHeadlessStream } = await import('./headless-stream.js');
 
       const logStream = await tailContainerLogs(containerName);
-      let resultSummary = '';
 
       for await (const chunk of parseHeadlessStream(logStream, codingAgent)) {
-        if (chunk._resultSummary) resultSummary = chunk._resultSummary;
+        chunks.push(chunk);
         streamCallback?.(chunk);
       }
 
@@ -81,14 +81,12 @@ const agentChatCodingTool = tool(
       await removeContainer(containerName);
       streamCallback?.(null);
 
-      if (exitCode !== 0) {
-        return `Task exited with errors (exit code ${exitCode}).`;
-      }
-      return resultSummary || 'Task completed successfully.';
+      chunks.push({ type: 'exit', exitCode });
+      return JSON.stringify(chunks);
     } catch (err) {
       console.error('[coding_agent] Failed:', err);
       runtime.configurable.streamCallback?.(null);
-      return `Failed to run coding agent: ${err.message}`;
+      return JSON.stringify([{ type: 'error', message: err.message }]);
     }
   },
   {
@@ -122,20 +120,20 @@ const codeChatCodingTool = tool(
       const codingAgent = getConfig('CODING_AGENT') || 'claude-code';
       const containerName = `${codingAgent}-headless-${randomUUID().slice(0, 8)}`;
 
-      await runHeadlessContainer({
+      const { backendApi } = await runHeadlessContainer({
         containerName, repo, branch, featureBranch, workspaceId,
         taskPrompt: prompt,
         mode,
       });
 
+      const chunks = [{ type: 'meta', codingAgent, backendApi }];
       const streamCallback = runtime.configurable.streamCallback;
       const { parseHeadlessStream } = await import('./headless-stream.js');
 
       const logStream = await tailContainerLogs(containerName);
-      let resultSummary = '';
 
       for await (const chunk of parseHeadlessStream(logStream, codingAgent)) {
-        if (chunk._resultSummary) resultSummary = chunk._resultSummary;
+        chunks.push(chunk);
         streamCallback?.(chunk);
       }
 
@@ -143,14 +141,12 @@ const codeChatCodingTool = tool(
       await removeContainer(containerName);
       streamCallback?.(null);
 
-      if (exitCode !== 0) {
-        return `Task exited with errors (exit code ${exitCode}).`;
-      }
-      return resultSummary || 'Task completed successfully.';
+      chunks.push({ type: 'exit', exitCode });
+      return JSON.stringify(chunks);
     } catch (err) {
       console.error('[coding_agent] Failed:', err);
       runtime.configurable.streamCallback?.(null);
-      return `Failed to run coding agent: ${err.message}`;
+      return JSON.stringify([{ type: 'error', message: err.message }]);
     }
   },
   {

package/lib/chat/actions.js

@@ -556,12 +556,13 @@ export async function getRunnersStatus(page = 1) {
  */
 export async function getRunnersConfig() {
   await requireAuth();
-  const { cronsFile, triggersFile } = await import('../paths.js');
+  const { PROJECT_ROOT } = await import('../paths.js');
   const fs = await import('fs');
+  const path = await import('path');
   let crons = [];
   let triggers = [];
-  try { crons = JSON.parse(fs.readFileSync(cronsFile, 'utf8')); } catch {}
-  try { triggers = JSON.parse(fs.readFileSync(triggersFile, 'utf8')); } catch {}
+  try { crons = JSON.parse(fs.readFileSync(path.join(PROJECT_ROOT, 'agent-job/CRONS.json'), 'utf8')); } catch {}
+  try { triggers = JSON.parse(fs.readFileSync(path.join(PROJECT_ROOT, 'event-handler/TRIGGERS.json'), 'utf8')); } catch {}
   return { crons, triggers };
 }
 
@@ -985,8 +986,8 @@ async function syncLitellmConfig() {
   try {
     const fs = await import('fs');
     const path = await import('path');
-    const { configDir } = await import('../paths.js');
-    const litellmDir = path.default.join(configDir, 'litellm');
+    const { PROJECT_ROOT } = await import('../paths.js');
+    const litellmDir = path.default.join(PROJECT_ROOT, 'event-handler/litellm');
     if (!fs.default.existsSync(litellmDir)) return;
 
     const { getConfig } = await import('../config.js');

package/lib/chat/components/crons-page.js

@@ -152,7 +152,7 @@ function CronsPage() {
       /* @__PURE__ */ jsx("p", { className: "text-sm font-medium mb-1", children: "No cron jobs configured" }),
       /* @__PURE__ */ jsxs("p", { className: "text-xs text-muted-foreground max-w-sm", children: [
         "Add scheduled jobs by editing ",
-        /* @__PURE__ */ jsx("span", { className: "font-mono", children: "config/CRONS.json" }),
+        /* @__PURE__ */ jsx("span", { className: "font-mono", children: "agent-job/CRONS.json" }),
         " in your project."
       ] })
     ] }) : /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-3", children: [

package/lib/chat/components/crons-page.jsx

@@ -216,7 +216,7 @@ export function CronsPage() {
           </div>
           <p className="text-sm font-medium mb-1">No cron jobs configured</p>
           <p className="text-xs text-muted-foreground max-w-sm">
-            Add scheduled jobs by editing <span className="font-mono">config/CRONS.json</span> in your project.
+            Add scheduled jobs by editing <span className="font-mono">agent-job/CRONS.json</span> in your project.
           </p>
         </div>
       ) : (

package/lib/chat/components/message.js

@@ -153,8 +153,9 @@ function ToolCall({ part, className }) {
             isDone && (() => {
               try {
                 const o = typeof part.output === "string" ? JSON.parse(part.output) : part.output;
-                if (o?.codingAgent || o?.backendApi) {
-                  return /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground", children: [o.codingAgent, o.backendApi].filter(Boolean).join(" \xB7 ") });
+                const meta = Array.isArray(o) ? o.find((e) => e.type === "meta") : o;
+                if (meta?.codingAgent || meta?.backendApi) {
+                  return /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground", children: [meta.codingAgent, meta.backendApi].filter(Boolean).join(" \xB7 ") });
                 }
               } catch {
               }

package/lib/chat/components/message.jsx

@@ -157,10 +157,11 @@ function ToolCall({ part, className }) {
             {isDone && (() => {
               try {
                 const o = typeof part.output === 'string' ? JSON.parse(part.output) : part.output;
-                if (o?.codingAgent || o?.backendApi) {
+                const meta = Array.isArray(o) ? o.find(e => e.type === 'meta') : o;
+                if (meta?.codingAgent || meta?.backendApi) {
                   return (
                     <span className="text-xs text-muted-foreground">
-                      {[o.codingAgent, o.backendApi].filter(Boolean).join(' · ')}
+                      {[meta.codingAgent, meta.backendApi].filter(Boolean).join(' · ')}
                     </span>
                   );
                 }

package/lib/chat/components/triggers-page.js

@@ -133,7 +133,7 @@ function TriggersPage() {
       /* @__PURE__ */ jsx("p", { className: "text-sm font-medium mb-1", children: "No triggers configured" }),
       /* @__PURE__ */ jsxs("p", { className: "text-xs text-muted-foreground max-w-sm", children: [
         "Add webhook triggers by editing ",
-        /* @__PURE__ */ jsx("span", { className: "font-mono", children: "config/TRIGGERS.json" }),
+        /* @__PURE__ */ jsx("span", { className: "font-mono", children: "event-handler/TRIGGERS.json" }),
         " in your project."
       ] })
     ] }) : /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-3", children: [

package/lib/chat/components/triggers-page.jsx

@@ -193,7 +193,7 @@ export function TriggersPage() {
           </div>
           <p className="text-sm font-medium mb-1">No triggers configured</p>
           <p className="text-xs text-muted-foreground max-w-sm">
-            Add webhook triggers by editing <span className="font-mono">config/TRIGGERS.json</span> in your project.
+            Add webhook triggers by editing <span className="font-mono">event-handler/TRIGGERS.json</span> in your project.
           </p>
         </div>
       ) : (