fix: restore regressions from discord-only refactor

src/agent-runner.ts

@@ -44,6 +44,7 @@ export interface AgentInput {
 export interface AgentOutput {
   status: 'success' | 'error';
   result: string | null;
+  phase?: 'progress' | 'final';
   newSessionId?: string;
   error?: string;
 }
@@ -164,10 +165,17 @@ function prepareGroupEnvironment(
     'CODEX_OPENAI_API_KEY',
     'CODEX_MODEL',
     'CODEX_EFFORT',
+    'MEMENTO_MCP_SSE_URL',
+    'MEMENTO_ACCESS_KEY',
+    'MEMENTO_MCP_REMOTE_PATH',
   ]);
 
   // Build a clean env without Claude Code nesting detection variables
   const cleanEnv = { ...(process.env as Record<string, string>) };
+  // Merge .env file values (readEnvFile only reads file, doesn't set process.env)
+  for (const [k, v] of Object.entries(envVars)) {
+    if (v && !cleanEnv[k]) cleanEnv[k] = v;
+  }
   delete cleanEnv.CLAUDECODE;
   delete cleanEnv.CLAUDE_CODE_ENTRYPOINT;
 
@@ -290,8 +298,9 @@ function prepareGroupEnvironment(
       let toml = fs.existsSync(configTomlPath)
         ? fs.readFileSync(configTomlPath, 'utf-8')
         : '';
-      // Remove existing nanoclaw MCP section if present (to refresh env vars)
+      // Remove existing nanoclaw/memento MCP sections if present (to refresh env vars)
       toml = toml.replace(/\n?\[mcp_servers\.nanoclaw\][\s\S]*?(?=\n\[|$)/, '');
+      toml = toml.replace(/\n?\[mcp_servers\.memento-mcp\][\s\S]*?(?=\n\[|$)/, '');
       const mcpSection = `
 [mcp_servers.nanoclaw]
 command = "node"
@@ -303,7 +312,24 @@ NANOCLAW_CHAT_JID = ${JSON.stringify(group.folder)}
 NANOCLAW_GROUP_FOLDER = ${JSON.stringify(group.folder)}
 NANOCLAW_IS_MAIN = ${JSON.stringify(isMain ? '1' : '0')}
 `;
-      toml = toml.trimEnd() + '\n' + mcpSection;
+      // Inject memento-mcp if MEMENTO_MCP_SSE_URL is set
+      const mementoSseUrl =
+        envVars.MEMENTO_MCP_SSE_URL || process.env.MEMENTO_MCP_SSE_URL;
+      const mementoAccessKey =
+        envVars.MEMENTO_ACCESS_KEY || process.env.MEMENTO_ACCESS_KEY || '';
+      const mementoRemotePath =
+        envVars.MEMENTO_MCP_REMOTE_PATH ||
+        process.env.MEMENTO_MCP_REMOTE_PATH ||
+        'mcp-remote';
+      const mementoSection = mementoSseUrl
+        ? `
+[mcp_servers.memento-mcp]
+command = ${JSON.stringify(mementoRemotePath)}
+args = [${JSON.stringify(mementoSseUrl)}, "--header", ${JSON.stringify(`Authorization:Bearer ${mementoAccessKey}`)}]
+`
+        : '';
+
+      toml = toml.trimEnd() + '\n' + mcpSection + mementoSection;
       fs.writeFileSync(configTomlPath, toml);
     }
 
@@ -461,6 +487,18 @@ export async function runAgentProcess(
             }
             hadStreamingOutput = true;
             resetTimeout();
+            if (parsed.status === 'error') {
+              logger.warn(
+                {
+                  group: group.name,
+                  chatJid: input.chatJid,
+                  runId: input.runId,
+                  error: parsed.error,
+                  newSessionId: parsed.newSessionId,
+                },
+                'Streamed agent error output',
+              );
+            }
             outputChain = outputChain.then(() => onOutput(parsed));
           } catch (err) {
             logger.warn(