thepopebot 1.2.74-beta.21 → 1.2.74-beta.23

package/lib/ai/agent.js

@@ -3,12 +3,16 @@ import { SystemMessage } from '@langchain/core/messages';
 import { createModel } from './model.js';
 import { createJobTool, getJobStatusTool, getSystemTechnicalSpecsTool, getSkillBuildingGuideTool, getSkillDetailsTool, createStartHeadlessCodingTool, createGetRepositoryDetailsTool } from './tools.js';
 import { SqliteSaver } from '@langchain/langgraph-checkpoint-sqlite';
-import { jobPlanningMd, codePlanningMd, codeExecutionMd, thepopebotDb } from '../paths.js';
+import { jobPlanningMd, codePlanningMd, thepopebotDb } from '../paths.js';
 import { render_md } from '../utils/render-md.js';
 import { createWebSearchTool, getProvider } from './web-search.js';
 
 let _agent = null;
 
+let _currentCodeModeType = 'plan';
+export function setCurrentCodeModeType(mode) { _currentCodeModeType = mode; }
+export function getCurrentCodeModeType() { return _currentCodeModeType; }
+
 /**
  * Get or create the LangGraph job agent singleton.
  * Uses createReactAgent which handles the tool loop automatically.
@@ -49,19 +53,16 @@ const _codeAgents = new Map();
 /**
  * Get or create a code agent for a specific chat/workspace.
  * Each code chat gets its own agent with unique start_coding tool bindings.
- * Agents are keyed by chatId+mode so switching modes creates a new agent with the right prompt.
  * @param {object} context
  * @param {string} context.repo - GitHub repo
  * @param {string} context.branch - Git branch
  * @param {string} context.workspaceId - Pre-created workspace row ID
  * @param {string} context.chatId - Chat thread ID
- * @param {string} [context.codeModeType='plan'] - 'plan' or 'code'
  * @returns {Promise<object>} LangGraph agent
  */
-export async function getCodeAgent({ repo, branch, workspaceId, chatId, codeModeType = 'plan' }) {
-  const cacheKey = `${chatId}:${codeModeType}`;
-  if (_codeAgents.has(cacheKey)) {
-    return _codeAgents.get(cacheKey);
+export async function getCodeAgent({ repo, branch, workspaceId, chatId }) {
+  if (_codeAgents.has(chatId)) {
+    return _codeAgents.get(chatId);
   }
 
   const model = await createModel();
@@ -78,15 +79,13 @@ export async function getCodeAgent({ repo, branch, workspaceId, chatId, codeMode
 
   const checkpointer = SqliteSaver.fromConnString(thepopebotDb);
 
-  const promptMd = codeModeType === 'code' ? codeExecutionMd : codePlanningMd;
-
   const agent = createReactAgent({
     llm: model,
     tools,
     checkpointSaver: checkpointer,
-    prompt: (state) => [new SystemMessage(render_md(promptMd)), ...state.messages],
+    prompt: (state) => [new SystemMessage(render_md(codePlanningMd)), ...state.messages],
   });
 
-  _codeAgents.set(cacheKey, agent);
+  _codeAgents.set(chatId, agent);
   return agent;
 }

package/lib/ai/headless-stream.js

@@ -1,55 +1,43 @@
+import { Transform } from 'stream';
+import split2 from 'split2';
+
 /**
  * Parse Docker container logs from a headless Claude Code container
  * running with --output-format stream-json.
  *
  * Three layers:
- * 1. Docker multiplexed frame parser (binary)
- * 2. NDJSON line splitter
+ * 1. Docker multiplexed frame decoder (Transform stream)
+ * 2. split2 for reliable NDJSON line splitting
  * 3. Claude Code stream-json → chat event mapper
  *
  * @param {import('http').IncomingMessage} dockerLogStream - Raw Docker log stream
  * @yields {{ type: string, text?: string, toolCallId?: string, toolName?: string, args?: object, result?: string }}
  */
 export async function* parseHeadlessStream(dockerLogStream) {
-  let frameBuf = Buffer.alloc(0);
-  let lineBuf = '';
-
-  for await (const chunk of dockerLogStream) {
-    // Layer 1: Docker multiplexed frame parser
-    frameBuf = Buffer.concat([frameBuf, chunk]);
-
-    let decoded = '';
-    while (frameBuf.length >= 8) {
-      const size = frameBuf.readUInt32BE(4);
-      if (frameBuf.length < 8 + size) break; // incomplete frame
-      const streamType = frameBuf[0];
-      if (streamType === 1) { // stdout only
-        decoded += frameBuf.slice(8, 8 + size).toString('utf8');
+  // Layer 1: Docker frame decoder
+  const frameDecoder = new Transform({
+    transform(chunk, encoding, callback) {
+      this._buf = this._buf ? Buffer.concat([this._buf, chunk]) : chunk;
+      while (this._buf.length >= 8) {
+        const size = this._buf.readUInt32BE(4);
+        if (this._buf.length < 8 + size) break;
+        if (this._buf[0] === 1) { // stdout only
+          this.push(this._buf.slice(8, 8 + size));
+        }
+        this._buf = this._buf.slice(8 + size);
       }
-      frameBuf = frameBuf.slice(8 + size);
+      callback();
     }
+  });
 
-    if (!decoded) continue;
-
-    // Layer 2: NDJSON line splitter
-    lineBuf += decoded;
-    const lines = lineBuf.split('\n');
-    lineBuf = lines.pop(); // keep incomplete last piece
-
-    for (const line of lines) {
-      const trimmed = line.trim();
-      if (!trimmed) continue;
-
-      // Layer 3: Event mapper
-      for (const event of mapLine(trimmed)) {
-        yield event;
-      }
-    }
-  }
+  // Layer 2: split2 for reliable line splitting
+  const lines = dockerLogStream.pipe(frameDecoder).pipe(split2());
 
-  // Process any remaining partial line
-  if (lineBuf.trim()) {
-    for (const event of mapLine(lineBuf.trim())) {
+  // Layer 3: map each complete line to chat events
+  for await (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    for (const event of mapLine(trimmed)) {
       yield event;
     }
   }
@@ -65,6 +53,7 @@ export function mapLine(line) {
   try {
     parsed = JSON.parse(line);
   } catch {
+    console.warn('[headless-stream] JSON parse failed, length:', line.length, 'preview:', line.slice(0, 120));
     // Non-JSON lines (NO_CHANGES, MERGE_SUCCESS, AGENT_FAILED, etc.)
     return [{ type: 'text', text: `\n${line}\n` }];
   }

package/lib/ai/index.js

@@ -1,6 +1,6 @@
 import { HumanMessage, AIMessage } from '@langchain/core/messages';
 import { z } from 'zod';
-import { getJobAgent, getCodeAgent } from './agent.js';
+import { getJobAgent, getCodeAgent, setCurrentCodeModeType } from './agent.js';
 import { createModel } from './model.js';
 import { jobSummaryMd } from '../paths.js';
 import { render_md } from '../utils/render-md.js';
@@ -134,12 +134,12 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
       workspaceId = existingChat.codeWorkspaceId;
     }
 
+    setCurrentCodeModeType(options.codeModeType || 'plan');
     agent = await getCodeAgent({
       repo: options.repo,
       branch: options.branch,
       workspaceId,
       chatId: threadId,
-      codeModeType: options.codeModeType || 'plan',
     });
   } else {
     agent = await getJobAgent();
@@ -194,14 +194,6 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
 
       if (msgType === 'ai') {
         // Debug: log web search content blocks to see actual shape
-        if (Array.isArray(msg.content)) {
-          for (const block of msg.content) {
-            if (block.type === 'server_tool_use' || block.type === 'server_tool_call' || block.type === 'web_search_tool_result') {
-              console.log(`[chatStream] ${block.type}:`, JSON.stringify(block));
-            }
-          }
-        }
-
         // Tool calls — AIMessage.tool_calls is an array of { id, name, args }
         if (msg.tool_calls?.length > 0) {
           for (const tc of msg.tool_calls) {
@@ -274,7 +266,7 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
     // Phase 2: Stream headless container output live
     if (headlessContainer) {
       try {
-        const { tailContainerLogs, waitForContainer, removeContainer, removeCodeWorkspaceVolume } =
+        const { tailContainerLogs, waitForContainer, removeContainer } =
           await import('../tools/docker.js');
         const { parseHeadlessStream } = await import('./headless-stream.js');
 
@@ -317,11 +309,6 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
         await removeContainer(headlessContainer.containerName);
 
         if (exitCode === 0) {
-          const existingChat = getChatById(threadId);
-          const wsId = existingChat?.codeWorkspaceId;
-          if (wsId) {
-            await removeCodeWorkspaceVolume(wsId);
-          }
           const completionMsg = '\n\nTask completed and merged back to base branch.';
           yield { type: 'text', text: completionMsg };
           fullText += completionMsg;

package/lib/ai/tools.js

@@ -5,6 +5,7 @@ import { z } from 'zod';
 import { createJob } from '../tools/create-job.js';
 import { getJobStatus } from '../tools/github.js';
 import { claudeMd, skillGuidePath, skillsDir } from '../paths.js';
+import { getCurrentCodeModeType } from './agent.js';
 
 const createJobTool = tool(
   async ({ job_description }) => {
@@ -276,7 +277,7 @@ function createGetRepositoryDetailsTool({ repo, branch }) {
  */
 function createStartHeadlessCodingTool({ repo, branch, workspaceId }) {
   return tool(
-    async ({ task_description, plan = true }) => {
+    async ({ task_description }) => {
       try {
         const { randomUUID } = await import('crypto');
         const containerName = `code-headless-${randomUUID().slice(0, 8)}`;
@@ -285,6 +286,8 @@ function createStartHeadlessCodingTool({ repo, branch, workspaceId }) {
         const workspace = getCodeWorkspaceById(workspaceId);
         const featureBranch = workspace?.featureBranch || `thepopebot/new-chat-${workspaceId.replace(/-/g, '').slice(0, 8)}`;
 
+        const plan = getCurrentCodeModeType() === 'plan';
+
         const { runHeadlessCodeContainer } = await import('../tools/docker.js');
 
         await runHeadlessCodeContainer({
@@ -315,9 +318,6 @@ function createStartHeadlessCodingTool({ repo, branch, workspaceId }) {
         task_description: z.string().describe(
           'Detailed description of the coding task. Include context, requirements, and any specific instructions.'
         ),
-        plan: z.boolean().default(true).describe(
-          'Defaults to true (plan permission mode — read-only, no writes). Set to false to run in dangerous mode with full write access for code execution.'
-        ),
       }),
     }
   );

package/lib/chat/components/code-mode-toggle.js

@@ -131,7 +131,7 @@ function CodeModeToggle({
       }
     ),
     enabled && /* @__PURE__ */ jsxs(Fragment, { children: [
-      /* @__PURE__ */ jsx("div", { className: "w-full sm:w-auto sm:min-w-[220px]", children: /* @__PURE__ */ jsx(
+      /* @__PURE__ */ jsx("div", { className: "w-full sm:w-auto sm:min-w-[240px] sm:max-w-[240px]", children: /* @__PURE__ */ jsx(
         Combobox,
         {
           options: repoOptions,
@@ -142,7 +142,7 @@ function CodeModeToggle({
           highlight: !repo && !loadingRepos
         }
       ) }),
-      /* @__PURE__ */ jsx("div", { className: cn("w-full sm:w-auto sm:min-w-[180px]", !repo && "opacity-50 pointer-events-none"), children: /* @__PURE__ */ jsx(
+      /* @__PURE__ */ jsx("div", { className: cn("w-full sm:w-auto sm:min-w-[200px] sm:max-w-[200px]", !repo && "opacity-50 pointer-events-none"), children: /* @__PURE__ */ jsx(
         Combobox,
         {
           options: branchOptions,

package/lib/chat/components/code-mode-toggle.jsx

@@ -173,7 +173,7 @@ export function CodeModeToggle({
       {/* Repo/branch pickers — inline, both always visible */}
       {enabled && (
         <>
-          <div className="w-full sm:w-auto sm:min-w-[220px]">
+          <div className="w-full sm:w-auto sm:min-w-[240px] sm:max-w-[240px]">
             <Combobox
               options={repoOptions}
               value={repo}
@@ -183,7 +183,7 @@ export function CodeModeToggle({
               highlight={!repo && !loadingRepos}
             />
           </div>
-          <div className={cn("w-full sm:w-auto sm:min-w-[180px]", !repo && "opacity-50 pointer-events-none")}>
+          <div className={cn("w-full sm:w-auto sm:min-w-[200px] sm:max-w-[200px]", !repo && "opacity-50 pointer-events-none")}>
             <Combobox
               options={branchOptions}
               value={branch}

package/lib/chat/components/message.js

@@ -280,7 +280,9 @@ function PreviewMessage({ message, isLoading, onRetry, onEdit }) {
               text ? /* @__PURE__ */ jsx("div", { className: "whitespace-pre-wrap break-words", children: text }) : null
             ] }) : /* @__PURE__ */ jsx(Fragment, { children: message.parts?.length > 0 ? message.parts.map((part, i) => {
               if (part.type === "text") {
-                return /* @__PURE__ */ jsx(Streamdown, { mode: isLoading ? "streaming" : "static", linkSafety, children: part.text }, i);
+                const prevPart = message.parts[i - 1];
+                const afterTool = prevPart?.type?.startsWith("tool-");
+                return /* @__PURE__ */ jsx(Streamdown, { className: afterTool ? "mt-3" : void 0, mode: isLoading ? "streaming" : "static", linkSafety, children: part.text }, i);
               }
               if (part.type === "file") {
                 if (part.mediaType?.startsWith("image/")) {

package/lib/chat/components/message.jsx

@@ -331,7 +331,9 @@ export function PreviewMessage({ message, isLoading, onRetry, onEdit }) {
                   {message.parts?.length > 0 ? (
                     message.parts.map((part, i) => {
                       if (part.type === 'text') {
-                        return <Streamdown key={i} mode={isLoading ? 'streaming' : 'static'} linkSafety={linkSafety}>{part.text}</Streamdown>;
+                        const prevPart = message.parts[i - 1];
+                        const afterTool = prevPart?.type?.startsWith('tool-');
+                        return <Streamdown key={i} className={afterTool ? 'mt-3' : undefined} mode={isLoading ? 'streaming' : 'static'} linkSafety={linkSafety}>{part.text}</Streamdown>;
                       }
                       if (part.type === 'file') {
                         if (part.mediaType?.startsWith('image/')) {

package/lib/code/actions.js

@@ -322,7 +322,7 @@ export async function closeInteractiveMode(id, isClean) {
   }
 
   try {
-    const { execInContainer, removeContainer, removeCodeWorkspaceVolume } = await import('../tools/docker.js');
+    const { execInContainer, removeContainer } = await import('../tools/docker.js');
 
     // Only fetch git data and inject context when the session is clean
     let commits = '';
@@ -344,9 +344,8 @@ export async function closeInteractiveMode(id, isClean) {
       }
     }
 
-    // Destroy container and volume
+    // Destroy container (volume preserved for reuse)
     await removeContainer(workspace.containerName);
-    await removeCodeWorkspaceVolume(id);
     clearWorkspaceSessions(id);
     updateContainerName(id, null);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thepopebot",
-  "version": "1.2.74-beta.21",
+  "version": "1.2.74-beta.23",
   "type": "module",
   "description": "Create autonomous AI agents with a two-layer architecture: Next.js Event Handler + Docker Agent.",
   "bin": {
@@ -90,6 +90,7 @@
     "lucide-react": "^0.400.0",
     "node-cron": "^3.0.3",
     "open": "^10.0.0",
+    "split2": "^4.2.0",
     "streamdown": "^2.2.0",
     "tailwind-merge": "^3.0.0",
     "uuid": "^9.0.0",