revert: roll back DB merge, keep useful improvements

Fully revert DB merge patch (WAL, composite PK, SERVICE_ID in IPC/
router_state/sessions). Return to proven split-DB architecture.

Keep:
- Docker/Apple Container cleanup
- Usage dashboard CLAUDE_CODE_OAUTH_TOKEN fallback
- Codex runner heartbeat
- Agent-runner stderr timeout reset

src/agent-runner.test.ts

@@ -13,6 +13,8 @@ vi.mock('./config.js', () => ({
   DATA_DIR: '/tmp/nanoclaw-test-data',
   GROUPS_DIR: '/tmp/nanoclaw-test-groups',
   IDLE_TIMEOUT: 1800000, // 30min
+  SERVICE_ID: 'claude',
+  SERVICE_AGENT_TYPE: 'claude-code',
   TIMEZONE: 'America/Los_Angeles',
 }));
 

src/agent-runner.ts

@@ -424,22 +424,6 @@ export async function runAgentProcess(
       }
     });
 
-    proc.stderr.on('data', (data) => {
-      const chunk = data.toString();
-      const lines = chunk.trim().split('\n');
-      for (const line of lines) {
-        if (line) logger.debug({ agent: group.folder }, line);
-      }
-      if (stderrTruncated) return;
-      const remaining = AGENT_MAX_OUTPUT_SIZE - stderr.length;
-      if (chunk.length > remaining) {
-        stderr += chunk.slice(0, remaining);
-        stderrTruncated = true;
-      } else {
-        stderr += chunk;
-      }
-    });
-
     let timedOut = false;
     let hadStreamingOutput = false;
     const configTimeout = group.agentConfig?.timeout || AGENT_TIMEOUT;
@@ -465,6 +449,29 @@ export async function runAgentProcess(
       timeout = setTimeout(killOnTimeout, timeoutMs);
     };
 
+    proc.stderr.on('data', (data) => {
+      const chunk = data.toString();
+      const lines = chunk.trim().split('\n');
+      for (const line of lines) {
+        if (!line) continue;
+        if (line.includes('Turn in progress')) {
+          logger.info({ group: group.name }, line.replace(/^\[.*?\]\s*/, ''));
+        } else {
+          logger.debug({ agent: group.folder }, line);
+        }
+      }
+      // Stderr activity means agent is alive — reset timeout
+      resetTimeout();
+      if (stderrTruncated) return;
+      const remaining = AGENT_MAX_OUTPUT_SIZE - stderr.length;
+      if (chunk.length > remaining) {
+        stderr += chunk.slice(0, remaining);
+        stderrTruncated = true;
+      } else {
+        stderr += chunk;
+      }
+    });
+
     proc.on('close', (code) => {
       clearTimeout(timeout);
       const duration = Date.now() - startTime;

src/index.ts

@@ -42,6 +42,7 @@ import {
   storeChatMetadata,
   storeMessage,
 } from './db.js';
+import { readEnvFile } from './env.js';
 import { GroupQueue } from './group-queue.js';
 import { resolveGroupFolderPath } from './group-folder.js';
 import { startIpcWatcher } from './ipc.js';
@@ -552,13 +553,19 @@ interface CodexRateLimit {
 
 async function fetchClaudeUsage(): Promise<ClaudeUsageData | null> {
   try {
-    const configDir =
-      process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
-    const credsPath = path.join(configDir, '.credentials.json');
-    if (!fs.existsSync(credsPath)) return null;
-
-    const creds = JSON.parse(fs.readFileSync(credsPath, 'utf-8'));
-    const token = creds?.claudeAiOauth?.accessToken;
+    const envToken = readEnvFile(['CLAUDE_CODE_OAUTH_TOKEN']);
+    let token =
+      process.env.CLAUDE_CODE_OAUTH_TOKEN ||
+      envToken.CLAUDE_CODE_OAUTH_TOKEN ||
+      '';
+    if (!token) {
+      const configDir =
+        process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
+      const credsPath = path.join(configDir, '.credentials.json');
+      if (!fs.existsSync(credsPath)) return null;
+      const creds = JSON.parse(fs.readFileSync(credsPath, 'utf-8'));
+      token = creds?.claudeAiOauth?.accessToken || '';
+    }
     if (!token) return null;
 
     const res = await fetch('https://api.anthropic.com/api/oauth/usage', {