@oyasmi/pipiclaw 0.2.0 → 0.2.1

package/dist/agent.js

@@ -1,17 +1,16 @@
 import { Agent } from "@mariozechner/pi-agent-core";
-import { getModel } from "@mariozechner/pi-ai";
-import { AgentSession, AuthStorage, convertToLlm, DefaultResourceLoader, formatSkillsForPrompt, loadSkillsFromDir, ModelRegistry, SessionManager, } from "@mariozechner/pi-coding-agent";
-import { existsSync, readFileSync } from "fs";
+import { AgentSession, AuthStorage, convertToLlm, DefaultResourceLoader, ModelRegistry, SessionManager, } from "@mariozechner/pi-coding-agent";
 import { mkdir, writeFile } from "fs/promises";
 import { basename, join } from "path";
 import { renderBuiltInHelp } from "./commands.js";
+import { getAgentConfig, getApiKeyForModel, getMemory, getSoul, loadPipiclawSkills } from "./config-loader.js";
 import { PipiclawSettingsManager, syncLogToSessionManager } from "./context.js";
 import * as log from "./log.js";
+import { findExactModelReferenceMatch, formatModelList, formatModelReference, resolveInitialModel, } from "./model-utils.js";
 import { APP_HOME_DIR, AUTH_CONFIG_PATH, MODELS_CONFIG_PATH } from "./paths.js";
+import { buildSystemPrompt } from "./prompt-builder.js";
 import { createExecutor } from "./sandbox.js";
 import { createPipiclawTools } from "./tools/index.js";
-// Default model - will be overridden by ModelRegistry if custom models are configured
-const defaultModel = getModel("anthropic", "claude-sonnet-4-5");
 function isSilentOutcome(outcome) {
     return outcome.kind === "silent";
 }
@@ -21,372 +20,8 @@ function isFinalOutcome(outcome) {
 function getFinalOutcomeText(outcome) {
     return isFinalOutcome(outcome) ? outcome.text : null;
 }
-function formatModelReference(model) {
-    return `${model.provider}/${model.id}`;
-}
-function findExactModelReferenceMatch(modelReference, availableModels) {
-    const trimmedReference = modelReference.trim();
-    if (!trimmedReference) {
-        return { ambiguous: false };
-    }
-    const normalizedReference = trimmedReference.toLowerCase();
-    const canonicalMatches = availableModels.filter((model) => `${model.provider}/${model.id}`.toLowerCase() === normalizedReference);
-    if (canonicalMatches.length === 1) {
-        return { match: canonicalMatches[0], ambiguous: false };
-    }
-    if (canonicalMatches.length > 1) {
-        return { ambiguous: true };
-    }
-    const slashIndex = trimmedReference.indexOf("/");
-    if (slashIndex !== -1) {
-        const provider = trimmedReference.substring(0, slashIndex).trim();
-        const modelId = trimmedReference.substring(slashIndex + 1).trim();
-        if (provider && modelId) {
-            const providerMatches = availableModels.filter((model) => model.provider.toLowerCase() === provider.toLowerCase() &&
-                model.id.toLowerCase() === modelId.toLowerCase());
-            if (providerMatches.length === 1) {
-                return { match: providerMatches[0], ambiguous: false };
-            }
-            if (providerMatches.length > 1) {
-                return { ambiguous: true };
-            }
-        }
-    }
-    const idMatches = availableModels.filter((model) => model.id.toLowerCase() === normalizedReference);
-    if (idMatches.length === 1) {
-        return { match: idMatches[0], ambiguous: false };
-    }
-    return { ambiguous: idMatches.length > 1 };
-}
-function formatModelList(models, currentModel, limit = 20) {
-    const refs = models
-        .slice()
-        .sort((a, b) => formatModelReference(a).localeCompare(formatModelReference(b)))
-        .map((model) => {
-        const ref = formatModelReference(model);
-        const marker = currentModel && currentModel.provider === model.provider && currentModel.id === model.id
-            ? " (current)"
-            : "";
-        return `- \`${ref}\`${marker}`;
-    });
-    if (refs.length <= limit) {
-        return refs.join("\n");
-    }
-    return `${refs.slice(0, limit).join("\n")}\n- ... and ${refs.length - limit} more`;
-}
-function resolveInitialModel(modelRegistry, settingsManager) {
-    const savedProvider = settingsManager.getDefaultProvider();
-    const savedModelId = settingsManager.getDefaultModel();
-    const availableModels = modelRegistry.getAvailable();
-    if (savedProvider && savedModelId) {
-        const savedModel = modelRegistry.find(savedProvider, savedModelId);
-        if (savedModel &&
-            availableModels.some((model) => model.provider === savedModel.provider && model.id === savedModel.id)) {
-            return savedModel;
-        }
-    }
-    if (availableModels.length > 0) {
-        return availableModels[0];
-    }
-    return defaultModel;
-}
-async function getApiKeyForModel(modelRegistry, model) {
-    const key = await modelRegistry.getApiKeyForProvider(model.provider);
-    if (key)
-        return key;
-    // Fallback: try anthropic env var
-    const envKey = process.env.ANTHROPIC_API_KEY;
-    if (envKey)
-        return envKey;
-    throw new Error(`No API key found for provider: ${model.provider}.\n\n` +
-        "Configure API key in ~/.pi/agent/models.json or set ANTHROPIC_API_KEY environment variable.");
-}
-// ============================================================================
-// Configuration file loaders: SOUL.md, AGENTS.md, MEMORY.md
-// ============================================================================
-/**
- * Load SOUL.md — defines the agent's identity, personality, and communication style.
- * Only loaded from workspace root (global).
- */
-function getSoul(workspaceDir) {
-    const soulPath = join(workspaceDir, "SOUL.md");
-    if (existsSync(soulPath)) {
-        try {
-            const content = readFileSync(soulPath, "utf-8").trim();
-            if (content)
-                return content;
-        }
-        catch (error) {
-            log.logWarning("Failed to read SOUL.md", `${soulPath}: ${error}`);
-        }
-    }
-    return "";
-}
-/**
- * Load AGENTS.md — defines the agent's behavior instructions, capabilities, and constraints.
- * Supports both global (workspace root) and channel-level override.
- */
-function getAgentConfig(channelDir) {
-    const parts = [];
-    // Read workspace-level AGENTS.md (global)
-    const workspaceAgentPath = join(channelDir, "..", "AGENTS.md");
-    if (existsSync(workspaceAgentPath)) {
-        try {
-            const content = readFileSync(workspaceAgentPath, "utf-8").trim();
-            if (content) {
-                parts.push(content);
-            }
-        }
-        catch (error) {
-            log.logWarning("Failed to read workspace AGENTS.md", `${workspaceAgentPath}: ${error}`);
-        }
-    }
-    // Read channel-specific AGENTS.md (overrides/extends global)
-    const channelAgentPath = join(channelDir, "AGENTS.md");
-    if (existsSync(channelAgentPath)) {
-        try {
-            const content = readFileSync(channelAgentPath, "utf-8").trim();
-            if (content) {
-                parts.push(content);
-            }
-        }
-        catch (error) {
-            log.logWarning("Failed to read channel AGENTS.md", `${channelAgentPath}: ${error}`);
-        }
-    }
-    return parts.join("\n\n");
-}
-function getMemory(channelDir) {
-    const parts = [];
-    // Read workspace-level memory (shared across all channels)
-    const workspaceMemoryPath = join(channelDir, "..", "MEMORY.md");
-    if (existsSync(workspaceMemoryPath)) {
-        try {
-            const content = readFileSync(workspaceMemoryPath, "utf-8").trim();
-            if (content) {
-                parts.push(`### Global Workspace Memory\n${content}`);
-            }
-        }
-        catch (error) {
-            log.logWarning("Failed to read workspace memory", `${workspaceMemoryPath}: ${error}`);
-        }
-    }
-    // Read channel-specific memory
-    const channelMemoryPath = join(channelDir, "MEMORY.md");
-    if (existsSync(channelMemoryPath)) {
-        try {
-            const content = readFileSync(channelMemoryPath, "utf-8").trim();
-            if (content) {
-                parts.push(`### Channel-Specific Memory\n${content}`);
-            }
-        }
-        catch (error) {
-            log.logWarning("Failed to read channel memory", `${channelMemoryPath}: ${error}`);
-        }
-    }
-    if (parts.length === 0) {
-        return "(no working memory yet)";
-    }
-    const combined = parts.join("\n\n");
-    // Warn if memory is getting too large (consumes system prompt token budget)
-    if (combined.length > 5000) {
-        return `\u26a0\ufe0f Memory is large (${combined.length} chars). Consolidate: remove outdated entries, merge duplicates, tighten descriptions.\n\n${combined}`;
-    }
-    return combined;
-}
-function loadPipiclawSkills(channelDir, workspacePath) {
-    const skillMap = new Map();
-    const hostWorkspacePath = join(channelDir, "..");
-    const translatePath = (hostPath) => {
-        if (hostPath.startsWith(hostWorkspacePath)) {
-            return workspacePath + hostPath.slice(hostWorkspacePath.length);
-        }
-        return hostPath;
-    };
-    // Load workspace-level skills (global)
-    const workspaceSkillsDir = join(hostWorkspacePath, "skills");
-    for (const skill of loadSkillsFromDir({ dir: workspaceSkillsDir, source: "workspace" }).skills) {
-        skill.filePath = translatePath(skill.filePath);
-        skill.baseDir = translatePath(skill.baseDir);
-        skillMap.set(skill.name, skill);
-    }
-    // Load channel-specific skills
-    const channelSkillsDir = join(channelDir, "skills");
-    for (const skill of loadSkillsFromDir({ dir: channelSkillsDir, source: "channel" }).skills) {
-        skill.filePath = translatePath(skill.filePath);
-        skill.baseDir = translatePath(skill.baseDir);
-        skillMap.set(skill.name, skill);
-    }
-    return Array.from(skillMap.values());
-}
 // ============================================================================
-// System Prompt Builder
-// ============================================================================
-function buildSystemPrompt(workspacePath, channelId, soul, agentConfig, memory, sandboxConfig, skills) {
-    const channelPath = `${workspacePath}/${channelId}`;
-    const isDocker = sandboxConfig.type === "docker";
-    const envDescription = isDocker
-        ? `You are running inside a Docker container (Alpine Linux).
-- Bash working directory: / (use cd or absolute paths)
-- Install tools with: apk add <package>
-- Your changes persist across sessions`
-        : `You are running directly on the host machine.
-- Bash working directory: ${process.cwd()}
-- Be careful with system modifications`;
-    // Build system prompt with configuration file layering:
-    // 1. SOUL.md (identity/personality)
-    // 2. Core instructions
-    // 3. AGENTS.md (behavior instructions)
-    // 4. Skills, Events, Memory
-    const sections = [];
-    // 1. SOUL.md — Agent identity
-    if (soul) {
-        sections.push(soul);
-    }
-    else {
-        sections.push("You are a DingTalk bot assistant. Be concise and helpful.");
-    }
-    // 2. Core instructions
-    sections.push(`## Context
-- For current date/time, use: date
-- You have access to previous conversation context including tool results from prior turns.
-- For older history beyond your context, search log.jsonl (contains user messages and your final responses, but not tool results).
-
-## Formatting
-Use Markdown for formatting. DingTalk AI Card supports basic Markdown:
-Bold: **text**, Italic: *text*, Code: \`code\`, Block: \`\`\`code\`\`\`, Links: [text](url)
-
-## Environment
-${envDescription}
-
-## Workspace Layout
-${workspacePath}/
-├── SOUL.md                      # Your identity/personality (read-only)
-├── AGENTS.md                    # Custom behavior instructions (read-only)
-├── MEMORY.md                    # Global memory (all channels, you can read/write)
-├── skills/                      # Global CLI tools you create
-├── events/                      # Scheduled events
-└── ${channelId}/                # This channel
-    ├── AGENTS.md                # Channel-specific instructions (read-only)
-    ├── MEMORY.md                # Channel-specific memory (you can read/write)
-    ├── log.jsonl                # Message history (no tool results)
-    ├── scratch/                 # Your working directory
-    └── skills/                  # Channel-specific tools`);
-    // 3. AGENTS.md — User-defined instructions
-    if (agentConfig) {
-        sections.push(`## Agent Instructions\n${agentConfig}`);
-    }
-    // 4. Skills
-    sections.push(`## Skills (Custom CLI Tools)
-You can create reusable CLI tools for recurring tasks (email, APIs, data processing, etc.).
-
-### Creating Skills
-Store in \`${workspacePath}/skills/<name>/\` (global) or \`${channelPath}/skills/<name>/\` (channel-specific).
-Each skill directory needs a \`SKILL.md\` with YAML frontmatter:
-
-\`\`\`markdown
----
-name: skill-name
-description: Short description of what this skill does
----
-
-# Skill Name
-
-Usage instructions, examples, etc.
-Scripts are in: {baseDir}/
-\`\`\`
-
-\`name\` and \`description\` are required. Use \`{baseDir}\` as placeholder for the skill's directory path.
-
-### Available Skills
-${skills.length > 0 ? formatSkillsForPrompt(skills) : "(no skills installed yet)"}`);
-    // 5. Events
-    sections.push(`## Events
-You can schedule events that wake you up at specific times or when external things happen. Events are JSON files in \`${workspacePath}/events/\`.
-
-### Event Types
-
-**Immediate** - Triggers as soon as harness sees the file.
-\`\`\`json
-{"type": "immediate", "channelId": "${channelId}", "text": "New event occurred"}
-\`\`\`
-
-**One-shot** - Triggers once at a specific time.
-\`\`\`json
-{"type": "one-shot", "channelId": "${channelId}", "text": "Reminder", "at": "2025-12-15T09:00:00+08:00"}
-\`\`\`
-
-**Periodic** - Triggers on a cron schedule.
-\`\`\`json
-{"type": "periodic", "channelId": "${channelId}", "text": "Check inbox", "schedule": "0 9 * * 1-5", "timezone": "${Intl.DateTimeFormat().resolvedOptions().timeZone}"}
-\`\`\`
-
-### Cron Format
-\`minute hour day-of-month month day-of-week\`
-
-### Creating Events
-\`\`\`bash
-cat > ${workspacePath}/events/reminder-$(date +%s).json << 'EOF'
-{"type": "one-shot", "channelId": "${channelId}", "text": "Reminder text", "at": "2025-12-14T09:00:00+08:00"}
-EOF
-\`\`\`
-
-### Silent Completion
-For periodic events where there's nothing to report, respond with just \`[SILENT]\`. This deletes the status message. Use this to avoid spam when periodic checks find nothing.
-
-### Limits
-Maximum 5 events can be queued.`);
-    // 6. Memory
-    sections.push(`## Memory
-Write to MEMORY.md files to persist context across conversations.
-- Global (${workspacePath}/MEMORY.md): skills, preferences, project info
-- Channel (${channelPath}/MEMORY.md): channel-specific decisions, ongoing work
-
-### Guidelines
-- Keep each MEMORY.md concise (target: under 50 lines)
-- Use clear headers to organize entries (## Preferences, ## Projects, etc.)
-- Remove outdated entries when they are no longer relevant
-- Merge duplicate or redundant items
-- Prefer structured formats (lists, key-value pairs) over prose
-- Update when you learn something important or when asked to remember something
-
-### Current Memory
-${memory}`);
-    // 7. System Configuration Log
-    sections.push(`## System Configuration Log
-Maintain ${workspacePath}/SYSTEM.md to log all environment modifications:
-- Installed packages (apk add, npm install, pip install)
-- Environment variables set
-- Config files modified
-- Skill dependencies installed
-
-Update this file whenever you modify the environment.`);
-    // 8. Tools
-    sections.push(`## Tools
-- bash: Run shell commands (primary tool). Install packages as needed.
-- read: Read files
-- write: Create/overwrite files
-- edit: Surgical file edits
-- attach: Share files (note: DingTalk file sharing is limited, output as text when possible)
-
-Each tool requires a "label" parameter (shown to user).`);
-    // 9. Log Queries
-    sections.push(`## Log Queries (for older history)
-Format: \`{"date":"...","ts":"...","user":"...","userName":"...","text":"...","isBot":false}\`
-The log contains user messages and your final responses (not tool calls/results).
-${isDocker ? "Install jq: apk add jq" : ""}
-
-\`\`\`bash
-# Recent messages
-tail -30 log.jsonl | jq -c '{date: .date[0:19], user: (.userName // .user), text}'
-
-# Search for specific topic
-grep -i "topic" log.jsonl | jq -c '{date: .date[0:19], user: (.userName // .user), text}'
-\`\`\``);
-    return sections.join("\n\n");
-}
-// ============================================================================
-// Agent Runner
+// Text helpers
 // ============================================================================
 function truncate(text, maxLen) {
     if (text.length <= maxLen)
@@ -436,78 +71,8 @@ function extractToolResultText(result) {
     }
     return JSON.stringify(result);
 }
-// Cache runners per channel
-const channelRunners = new Map();
-export function getOrCreateRunner(sandboxConfig, channelId, channelDir) {
-    const existing = channelRunners.get(channelId);
-    if (existing)
-        return existing;
-    const runner = createRunner(sandboxConfig, channelId, channelDir);
-    channelRunners.set(channelId, runner);
-    return runner;
-}
-function createRunner(sandboxConfig, channelId, channelDir) {
-    const executor = createExecutor(sandboxConfig);
-    const workspacePath = executor.getWorkspacePath(channelDir.replace(`/${channelId}`, ""));
-    const workspaceDir = join(channelDir, "..");
-    // Create tools
-    const tools = createPipiclawTools(executor);
-    // Initial system prompt
-    const soul = getSoul(workspaceDir);
-    const agentConfig = getAgentConfig(channelDir);
-    const memory = getMemory(channelDir);
-    const initialSkills = loadPipiclawSkills(channelDir, workspacePath);
-    let currentSkills = initialSkills;
-    const systemPrompt = buildSystemPrompt(workspacePath, channelId, soul, agentConfig, memory, sandboxConfig, initialSkills);
-    // Create session manager
-    const contextFile = join(channelDir, "context.jsonl");
-    const sessionManager = SessionManager.open(contextFile, channelDir);
-    const settingsManager = new PipiclawSettingsManager(APP_HOME_DIR);
-    // Create AuthStorage and ModelRegistry
-    const authStorage = AuthStorage.create(AUTH_CONFIG_PATH);
-    const modelRegistry = new ModelRegistry(authStorage, MODELS_CONFIG_PATH);
-    // Resolve model: prefer saved global default, fall back to first available model
-    let activeModel = resolveInitialModel(modelRegistry, settingsManager);
-    log.logInfo(`Using model: ${activeModel.provider}/${activeModel.id} (${activeModel.name})`);
-    // Create agent
-    const agent = new Agent({
-        initialState: {
-            systemPrompt,
-            model: activeModel,
-            thinkingLevel: "off",
-            tools,
-        },
-        convertToLlm,
-        getApiKey: async () => getApiKeyForModel(modelRegistry, activeModel),
-    });
-    // Load existing messages
-    const loadedSession = sessionManager.buildSessionContext();
-    if (loadedSession.messages.length > 0) {
-        agent.replaceMessages(loadedSession.messages);
-        log.logInfo(`[${channelId}] Loaded ${loadedSession.messages.length} messages from context.jsonl`);
-    }
-    const resourceLoader = new DefaultResourceLoader({
-        cwd: process.cwd(),
-        agentDir: APP_HOME_DIR,
-        settingsManager: settingsManager,
-        skillsOverride: (base) => ({
-            skills: [...base.skills, ...currentSkills],
-            diagnostics: base.diagnostics,
-        }),
-    });
-    const baseToolsOverride = Object.fromEntries(tools.map((tool) => [tool.name, tool]));
-    // Create AgentSession
-    const session = new AgentSession({
-        agent,
-        sessionManager,
-        settingsManager: settingsManager,
-        cwd: process.cwd(),
-        modelRegistry,
-        resourceLoader,
-        baseToolsOverride,
-    });
-    // Mutable per-run state
-    const runState = {
+function createEmptyRunState() {
+    return {
         ctx: null,
         logCtx: null,
         queue: null,
@@ -524,450 +89,491 @@ function createRunner(sandboxConfig, channelId, channelDir) {
         finalOutcome: { kind: "none" },
         finalResponseDelivered: false,
     };
-    const sendCommandReply = async (ctx, text) => {
-        const delivered = await ctx.respondPlain(text);
-        if (!delivered) {
-            await ctx.replaceMessage(text);
-            await ctx.flush();
-        }
-    };
-    const requireQueuedMessage = (text, commandName) => {
-        const trimmedText = text.trim();
-        if (!trimmedText) {
-            throw new Error(`/${commandName} requires a message.`);
-        }
-        return trimmedText;
-    };
-    const queueBusyMessage = async (delivery, text) => {
-        if (!session.isStreaming) {
-            throw new Error("No task is currently running.");
-        }
-        if (delivery === "followUp") {
-            await session.followUp(text);
-        }
-        else {
-            await session.steer(text);
-        }
-    };
-    const handleModelBuiltinCommand = async (ctx, args) => {
-        modelRegistry.refresh();
-        const availableModels = await modelRegistry.getAvailable();
-        const currentModel = session.model;
-        if (!args.trim()) {
-            const current = currentModel ? `\`${formatModelReference(currentModel)}\`` : "(none)";
-            const available = availableModels.length > 0 ? formatModelList(availableModels, currentModel) : "- (none)";
-            await sendCommandReply(ctx, `# Model
-
-Current model: ${current}
-
-Use \`/model <provider/modelId>\` or \`/model <modelId>\` to switch. Bare model IDs must resolve uniquely.
-
-Available models:
-${available}`);
-            return;
-        }
-        const match = findExactModelReferenceMatch(args, availableModels);
-        if (match.match) {
-            await session.setModel(match.match);
-            activeModel = match.match;
-            await sendCommandReply(ctx, `已切换模型到 \`${formatModelReference(match.match)}\`。`);
-            return;
+}
+// ============================================================================
+// ChannelRunner
+// ============================================================================
+class ChannelRunner {
+    // --- Constructed once ---
+    sandboxConfig;
+    channelId;
+    channelDir;
+    workspacePath;
+    workspaceDir;
+    session;
+    agent;
+    sessionManager;
+    settingsManager;
+    modelRegistry;
+    // --- Mutable across runs ---
+    activeModel;
+    currentSkills;
+    // --- Per run ---
+    runState = createEmptyRunState();
+    constructor(sandboxConfig, channelId, channelDir) {
+        this.sandboxConfig = sandboxConfig;
+        this.channelId = channelId;
+        this.channelDir = channelDir;
+        const executor = createExecutor(sandboxConfig);
+        this.workspacePath = executor.getWorkspacePath(channelDir.replace(`/${channelId}`, ""));
+        this.workspaceDir = join(channelDir, "..");
+        // Create tools
+        const tools = createPipiclawTools(executor);
+        // Initial system prompt
+        const soul = getSoul(this.workspaceDir);
+        const agentConfig = getAgentConfig(channelDir);
+        const memory = getMemory(channelDir);
+        const initialSkills = loadPipiclawSkills(channelDir, this.workspacePath);
+        this.currentSkills = initialSkills;
+        const systemPrompt = buildSystemPrompt(this.workspacePath, channelId, soul, agentConfig, memory, sandboxConfig, initialSkills);
+        // Create session manager
+        const contextFile = join(channelDir, "context.jsonl");
+        this.sessionManager = SessionManager.open(contextFile, channelDir);
+        this.settingsManager = new PipiclawSettingsManager(APP_HOME_DIR);
+        // Create AuthStorage and ModelRegistry
+        const authStorage = AuthStorage.create(AUTH_CONFIG_PATH);
+        this.modelRegistry = new ModelRegistry(authStorage, MODELS_CONFIG_PATH);
+        // Resolve model: prefer saved global default, fall back to first available model
+        this.activeModel = resolveInitialModel(this.modelRegistry, this.settingsManager);
+        log.logInfo(`Using model: ${this.activeModel.provider}/${this.activeModel.id} (${this.activeModel.name})`);
+        // Create agent
+        this.agent = new Agent({
+            initialState: {
+                systemPrompt,
+                model: this.activeModel,
+                thinkingLevel: "off",
+                tools,
+            },
+            convertToLlm,
+            getApiKey: async () => getApiKeyForModel(this.modelRegistry, this.activeModel),
+        });
+        // Load existing messages
+        const loadedSession = this.sessionManager.buildSessionContext();
+        if (loadedSession.messages.length > 0) {
+            this.agent.replaceMessages(loadedSession.messages);
+            log.logInfo(`[${channelId}] Loaded ${loadedSession.messages.length} messages from context.jsonl`);
+        }
+        const resourceLoader = new DefaultResourceLoader({
+            cwd: process.cwd(),
+            agentDir: APP_HOME_DIR,
+            settingsManager: this.settingsManager,
+            skillsOverride: (base) => ({
+                skills: [...base.skills, ...this.currentSkills],
+                diagnostics: base.diagnostics,
+            }),
+        });
+        const baseToolsOverride = Object.fromEntries(tools.map((tool) => [tool.name, tool]));
+        // Create AgentSession
+        this.session = new AgentSession({
+            agent: this.agent,
+            sessionManager: this.sessionManager,
+            settingsManager: this.settingsManager,
+            cwd: process.cwd(),
+            modelRegistry: this.modelRegistry,
+            resourceLoader,
+            baseToolsOverride,
+        });
+        // Subscribe to session events
+        this.subscribeToSessionEvents();
+    }
+    // === Public API ===
+    async run(ctx, _store) {
+        this.resetRunState(ctx);
+        // Create queue for this run
+        let queueChain = Promise.resolve();
+        this.runState.queue = {
+            enqueue: (fn, errorContext) => {
+                queueChain = queueChain.then(async () => {
+                    try {
+                        await fn();
+                    }
+                    catch (err) {
+                        const errMsg = err instanceof Error ? err.message : String(err);
+                        log.logWarning(`DingTalk API error (${errorContext})`, errMsg);
+                    }
+                });
+            },
+            enqueueMessage: function (text, target, errorContext, doLog = true) {
+                this.enqueue(() => (target === "main" ? ctx.respond(text, doLog) : ctx.respondInThread(text)), errorContext);
+            },
+        };
+        try {
+            // Ensure channel directory exists
+            await mkdir(this.channelDir, { recursive: true });
+            // Update system prompt and runtime resources with fresh config
+            const soul = getSoul(this.workspaceDir);
+            const agentConfig = getAgentConfig(this.channelDir);
+            const memory = getMemory(this.channelDir);
+            const skills = loadPipiclawSkills(this.channelDir, this.workspacePath);
+            this.currentSkills = skills;
+            const systemPrompt = buildSystemPrompt(this.workspacePath, this.channelId, soul, agentConfig, memory, this.sandboxConfig, skills);
+            this.session.agent.setSystemPrompt(systemPrompt);
+            await this.session.reload();
+            // Sync messages from log.jsonl
+            const syncedCount = syncLogToSessionManager(this.sessionManager, this.channelDir, ctx.message.ts);
+            if (syncedCount > 0) {
+                log.logInfo(`[${this.channelId}] Synced ${syncedCount} messages from log.jsonl`);
+            }
+            // Reload messages from context.jsonl
+            const reloadedSession = this.sessionManager.buildSessionContext();
+            if (reloadedSession.messages.length > 0) {
+                this.agent.replaceMessages(reloadedSession.messages);
+                log.logInfo(`[${this.channelId}] Reloaded ${reloadedSession.messages.length} messages from context`);
+            }
+            // Log context info
+            log.logInfo(`Context sizes - system: ${systemPrompt.length} chars, memory: ${memory.length} chars`);
+            // Build user message with timestamp and username prefix
+            const now = new Date();
+            const pad = (n) => n.toString().padStart(2, "0");
+            const offset = -now.getTimezoneOffset();
+            const offsetSign = offset >= 0 ? "+" : "-";
+            const offsetHours = pad(Math.floor(Math.abs(offset) / 60));
+            const offsetMins = pad(Math.abs(offset) % 60);
+            const timestamp = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}${offsetSign}${offsetHours}:${offsetMins}`;
+            const userMessage = `[${timestamp}] [${ctx.message.userName || "unknown"}]: ${ctx.message.text}`;
+            // Debug: write context to last_prompt.json (only with PIPICLAW_DEBUG=1)
+            if (process.env.PIPICLAW_DEBUG) {
+                const debugContext = {
+                    systemPrompt,
+                    messages: this.session.messages,
+                    newUserMessage: userMessage,
+                };
+                await writeFile(join(this.channelDir, "last_prompt.json"), JSON.stringify(debugContext, null, 2));
+            }
+            await this.session.prompt(userMessage);
         }
-        const available = availableModels.length > 0 ? formatModelList(availableModels, currentModel, 10) : "- (none)";
-        if (match.ambiguous) {
-            await sendCommandReply(ctx, `未切换模型：\`${args.trim()}\` 匹配到多个模型。请改用精确的 \`provider/modelId\` 形式。
-
-Available models:
-${available}`);
-            return;
+        catch (err) {
+            this.runState.stopReason = "error";
+            this.runState.errorMessage = err instanceof Error ? err.message : String(err);
+            log.logWarning(`[${this.channelId}] Runner failed`, this.runState.errorMessage);
+        }
+        finally {
+            await queueChain;
+            const finalOutcome = this.runState.finalOutcome;
+            const finalOutcomeText = getFinalOutcomeText(finalOutcome);
+            try {
+                if (this.runState.stopReason === "error" &&
+                    this.runState.errorMessage &&
+                    !this.runState.finalResponseDelivered) {
+                    try {
+                        await ctx.replaceMessage("_Sorry, something went wrong_");
+                    }
+                    catch (err) {
+                        const errMsg = err instanceof Error ? err.message : String(err);
+                        log.logWarning("Failed to post error message", errMsg);
+                    }
+                }
+                else if (isSilentOutcome(finalOutcome)) {
+                    try {
+                        await ctx.deleteMessage();
+                        log.logInfo("Silent response - deleted message");
+                    }
+                    catch (err) {
+                        const errMsg = err instanceof Error ? err.message : String(err);
+                        log.logWarning("Failed to delete message for silent response", errMsg);
+                    }
+                }
+                else if (finalOutcomeText && !this.runState.finalResponseDelivered) {
+                    try {
+                        await ctx.replaceMessage(finalOutcomeText);
+                    }
+                    catch (err) {
+                        const errMsg = err instanceof Error ? err.message : String(err);
+                        log.logWarning("Failed to replace message with final text", errMsg);
+                    }
+                }
+                await ctx.flush();
+            }
+            finally {
+                await ctx.close();
+            }
+            // Log usage summary
+            if (this.runState.totalUsage.cost.total > 0) {
+                const messages = this.session.messages;
+                const lastAssistantMessage = messages
+                    .slice()
+                    .reverse()
+                    .find((m) => m.role === "assistant" && m.stopReason !== "aborted");
+                const contextTokens = lastAssistantMessage
+                    ? lastAssistantMessage.usage.input +
+                        lastAssistantMessage.usage.output +
+                        lastAssistantMessage.usage.cacheRead +
+                        lastAssistantMessage.usage.cacheWrite
+                    : 0;
+                const currentRunModel = this.session.model ?? this.activeModel;
+                const contextWindow = currentRunModel.contextWindow || 200000;
+                log.logUsageSummary(this.runState.logCtx, this.runState.totalUsage, contextTokens, contextWindow);
+            }
+            // Clear run state
+            this.runState.ctx = null;
+            this.runState.logCtx = null;
+            this.runState.queue = null;
         }
-        await sendCommandReply(ctx, `未找到模型 \`${args.trim()}\`。请使用精确的 \`provider/modelId\` 或唯一的 \`modelId\`。
-
-Available models:
-${available}`);
-    };
-    const handleBuiltInCommand = async (ctx, command) => {
+        return { stopReason: this.runState.stopReason, errorMessage: this.runState.errorMessage };
+    }
+    async handleBuiltinCommand(ctx, command) {
         try {
             switch (command.name) {
                 case "help":
-                    await sendCommandReply(ctx, renderBuiltInHelp());
+                    await this.sendCommandReply(ctx, renderBuiltInHelp());
                     return;
                 case "new": {
-                    const completed = await session.newSession();
-                    await sendCommandReply(ctx, completed
-                        ? `已开启新会话。
-
-Session ID: \`${session.sessionId}\``
-                        : "新会话已取消。");
+                    const completed = await this.session.newSession();
+                    await this.sendCommandReply(ctx, completed ? `已开启新会话。\n\nSession ID: \`${this.session.sessionId}\`` : "新会话已取消。");
                     return;
                 }
                 case "compact": {
-                    const result = await session.compact(command.args || undefined);
-                    await sendCommandReply(ctx, `已压缩当前会话上下文。
-
-- Tokens before compaction: \`${result.tokensBefore}\`
-- Summary:
-
-\`\`\`text
-${result.summary}
-\`\`\``);
+                    const result = await this.session.compact(command.args || undefined);
+                    await this.sendCommandReply(ctx, `已压缩当前会话上下文。\n\n- Tokens before compaction: \`${result.tokensBefore}\`\n- Summary:\n\n\`\`\`text\n${result.summary}\n\`\`\``);
                     return;
                 }
                 case "session": {
-                    const stats = session.getSessionStats();
-                    const currentModel = session.model ? `\`${formatModelReference(session.model)}\`` : "(none)";
+                    const stats = this.session.getSessionStats();
+                    const currentModel = this.session.model ? `\`${formatModelReference(this.session.model)}\`` : "(none)";
                     const sessionFile = stats.sessionFile ? `\`${basename(stats.sessionFile)}\`` : "(none)";
-                    await sendCommandReply(ctx, `# Session
-
-- Session ID: \`${stats.sessionId}\`
-- Session file: ${sessionFile}
-- Model: ${currentModel}
-- Thinking level: \`${session.thinkingLevel}\`
-- User messages: \`${stats.userMessages}\`
-- Assistant messages: \`${stats.assistantMessages}\`
-- Tool calls: \`${stats.toolCalls}\`
-- Tool results: \`${stats.toolResults}\`
-- Total messages: \`${stats.totalMessages}\`
-- Tokens: \`${stats.tokens.total}\` (input \`${stats.tokens.input}\`, output \`${stats.tokens.output}\`, cache read \`${stats.tokens.cacheRead}\`, cache write \`${stats.tokens.cacheWrite}\`)
-- Cost: \`$${stats.cost.toFixed(4)}\``);
+                    await this.sendCommandReply(ctx, `# Session\n\n- Session ID: \`${stats.sessionId}\`\n- Session file: ${sessionFile}\n- Model: ${currentModel}\n- Thinking level: \`${this.session.thinkingLevel}\`\n- User messages: \`${stats.userMessages}\`\n- Assistant messages: \`${stats.assistantMessages}\`\n- Tool calls: \`${stats.toolCalls}\`\n- Tool results: \`${stats.toolResults}\`\n- Total messages: \`${stats.totalMessages}\`\n- Tokens: \`${stats.tokens.total}\` (input \`${stats.tokens.input}\`, output \`${stats.tokens.output}\`, cache read \`${stats.tokens.cacheRead}\`, cache write \`${stats.tokens.cacheWrite}\`)\n- Cost: \`$${stats.cost.toFixed(4)}\``);
                     return;
                 }
                 case "model":
-                    await handleModelBuiltinCommand(ctx, command.args);
+                    await this.handleModelCommand(ctx, command.args);
                     return;
                 case "stop":
-                    await sendCommandReply(ctx, "No task is running. Use `/stop` only while a task is running.");
+                    await this.sendCommandReply(ctx, "No task is running. Use `/stop` only while a task is running.");
                     return;
                 case "steer":
-                    requireQueuedMessage(command.args, "steer");
-                    await sendCommandReply(ctx, "No task is running. Send the message directly instead of using `/steer`.");
+                    this.requireQueuedMessage(command.args, "steer");
+                    await this.sendCommandReply(ctx, "No task is running. Send the message directly instead of using `/steer`.");
                     return;
                 case "followup":
-                    requireQueuedMessage(command.args, "followup");
-                    await sendCommandReply(ctx, "No task is running. Send the message directly now, or use `/followup` while a task is running.");
+                    this.requireQueuedMessage(command.args, "followup");
+                    await this.sendCommandReply(ctx, "No task is running. Send the message directly now, or use `/followup` while a task is running.");
                     return;
             }
         }
         catch (err) {
             const errMsg = err instanceof Error ? err.message : String(err);
-            log.logWarning(`[${channelId}] Built-in command failed`, errMsg);
-            await sendCommandReply(ctx, `命令执行失败：${errMsg}`);
+            log.logWarning(`[${this.channelId}] Built-in command failed`, errMsg);
+            await this.sendCommandReply(ctx, `命令执行失败：${errMsg}`);
         }
-    };
-    // Subscribe to events ONCE
-    session.subscribe(async (event) => {
-        if (!runState.ctx || !runState.logCtx || !runState.queue)
-            return;
-        const { ctx, logCtx, queue, pendingTools } = runState;
-        if (event.type === "tool_execution_start") {
-            const agentEvent = event;
-            const args = agentEvent.args;
-            const label = args.label || agentEvent.toolName;
-            pendingTools.set(agentEvent.toolCallId, {
-                toolName: agentEvent.toolName,
-                args: agentEvent.args,
-                startTime: Date.now(),
-            });
-            log.logToolStart(logCtx, agentEvent.toolName, label, agentEvent.args);
-            queue.enqueue(() => ctx.respond(formatProgressEntry("tool", label), false), "tool label");
+    }
+    async queueSteer(text) {
+        await this.queueBusyMessage("steer", this.requireQueuedMessage(text, "steer"));
+    }
+    async queueFollowUp(text) {
+        await this.queueBusyMessage("followUp", this.requireQueuedMessage(text, "followup"));
+    }
+    abort() {
+        this.session.abort();
+    }
+    // === Private helpers ===
+    async sendCommandReply(ctx, text) {
+        const delivered = await ctx.respondPlain(text);
+        if (!delivered) {
+            await ctx.replaceMessage(text);
+            await ctx.flush();
         }
-        else if (event.type === "tool_execution_end") {
-            const agentEvent = event;
-            const resultStr = extractToolResultText(agentEvent.result);
-            const pending = pendingTools.get(agentEvent.toolCallId);
-            pendingTools.delete(agentEvent.toolCallId);
-            const durationMs = pending ? Date.now() - pending.startTime : 0;
-            if (agentEvent.isError) {
-                log.logToolError(logCtx, agentEvent.toolName, durationMs, resultStr);
-            }
-            else {
-                log.logToolSuccess(logCtx, agentEvent.toolName, durationMs, resultStr);
-            }
-            if (agentEvent.isError) {
-                queue.enqueue(() => ctx.respond(formatProgressEntry("error", truncate(resultStr, 200)), false), "tool error");
-            }
+    }
+    requireQueuedMessage(text, commandName) {
+        const trimmedText = text.trim();
+        if (!trimmedText) {
+            throw new Error(`/${commandName} requires a message.`);
         }
-        else if (event.type === "message_start") {
-            const agentEvent = event;
-            if (agentEvent.message.role === "assistant") {
-                log.logResponseStart(logCtx);
-            }
+        return trimmedText;
+    }
+    async queueBusyMessage(delivery, text) {
+        if (!this.session.isStreaming) {
+            throw new Error("No task is currently running.");
         }
-        else if (event.type === "message_end") {
-            const agentEvent = event;
-            if (agentEvent.message.role === "assistant") {
-                const assistantMsg = agentEvent.message;
-                if (assistantMsg.stopReason) {
-                    runState.stopReason = assistantMsg.stopReason;
-                }
-                if (assistantMsg.errorMessage) {
-                    runState.errorMessage = assistantMsg.errorMessage;
-                }
-                if (assistantMsg.usage) {
-                    runState.totalUsage.input += assistantMsg.usage.input;
-                    runState.totalUsage.output += assistantMsg.usage.output;
-                    runState.totalUsage.cacheRead += assistantMsg.usage.cacheRead;
-                    runState.totalUsage.cacheWrite += assistantMsg.usage.cacheWrite;
-                    runState.totalUsage.cost.input += assistantMsg.usage.cost.input;
-                    runState.totalUsage.cost.output += assistantMsg.usage.cost.output;
-                    runState.totalUsage.cost.cacheRead += assistantMsg.usage.cost.cacheRead;
-                    runState.totalUsage.cost.cacheWrite += assistantMsg.usage.cost.cacheWrite;
-                    runState.totalUsage.cost.total += assistantMsg.usage.cost.total;
-                }
-                const content = agentEvent.message.content;
-                const thinkingParts = [];
-                const textParts = [];
-                let hasToolCalls = false;
-                for (const part of content) {
-                    if (part.type === "thinking") {
-                        thinkingParts.push(part.thinking);
-                    }
-                    else if (part.type === "text") {
-                        textParts.push(part.text);
-                    }
-                    else if (part.type === "toolCall") {
-                        hasToolCalls = true;
-                    }
-                }
-                const text = textParts.join("\n");
-                for (const thinking of thinkingParts) {
-                    log.logThinking(logCtx, thinking);
-                    queue.enqueue(() => ctx.respond(formatProgressEntry("thinking", thinking), false), "thinking");
-                }
-                if (hasToolCalls && text.trim()) {
-                    queue.enqueue(() => ctx.respond(formatProgressEntry("assistant", text), false), "assistant progress");
-                }
-            }
+        if (delivery === "followUp") {
+            await this.session.followUp(text);
         }
-        else if (event.type === "turn_end") {
-            const turnEvent = event;
-            if (turnEvent.message.role === "assistant" && turnEvent.toolResults.length === 0) {
-                if (turnEvent.message.stopReason === "error" || turnEvent.message.stopReason === "aborted") {
-                    return;
-                }
-                const finalContent = turnEvent.message.content;
-                const finalText = finalContent
-                    .filter((part) => part.type === "text" && !!part.text)
-                    .map((part) => part.text)
-                    .join("\n");
-                const trimmedFinalText = finalText.trim();
-                if (!trimmedFinalText) {
-                    return;
-                }
-                if (trimmedFinalText === "[SILENT]" || trimmedFinalText.startsWith("[SILENT]")) {
-                    runState.finalOutcome = { kind: "silent" };
-                    return;
-                }
-                if (runState.finalOutcome.kind === "final" && runState.finalOutcome.text.trim() === trimmedFinalText) {
-                    return;
-                }
-                runState.finalOutcome = { kind: "final", text: finalText };
-                log.logResponse(logCtx, finalText);
-                queue.enqueue(async () => {
-                    const delivered = await ctx.respondPlain(finalText);
-                    if (delivered) {
-                        runState.finalResponseDelivered = true;
-                    }
-                }, "final response");
-            }
+        else {
+            await this.session.steer(text);
         }
-        else if (event.type === "auto_compaction_start") {
-            log.logInfo(`Auto-compaction started (reason: ${event.reason})`);
-            queue.enqueue(() => ctx.respond(formatProgressEntry("assistant", "Compacting context..."), false), "compaction start");
+    }
+    async handleModelCommand(ctx, args) {
+        this.modelRegistry.refresh();
+        const availableModels = await this.modelRegistry.getAvailable();
+        const currentModel = this.session.model;
+        if (!args.trim()) {
+            const current = currentModel ? `\`${formatModelReference(currentModel)}\`` : "(none)";
+            const available = availableModels.length > 0 ? formatModelList(availableModels, currentModel) : "- (none)";
+            await this.sendCommandReply(ctx, `# Model\n\nCurrent model: ${current}\n\nUse \`/model <provider/modelId>\` or \`/model <modelId>\` to switch. Bare model IDs must resolve uniquely.\n\nAvailable models:\n${available}`);
+            return;
         }
-        else if (event.type === "auto_compaction_end") {
-            const compEvent = event;
-            if (compEvent.result) {
-                log.logInfo(`Auto-compaction complete: ${compEvent.result.tokensBefore} tokens compacted`);
-            }
-            else if (compEvent.aborted) {
-                log.logInfo("Auto-compaction aborted");
-            }
+        const match = findExactModelReferenceMatch(args, availableModels);
+        if (match.match) {
+            await this.session.setModel(match.match);
+            this.activeModel = match.match;
+            await this.sendCommandReply(ctx, `已切换模型到 \`${formatModelReference(match.match)}\`。`);
+            return;
         }
-        else if (event.type === "auto_retry_start") {
-            const retryEvent = event;
-            log.logWarning(`Retrying (${retryEvent.attempt}/${retryEvent.maxAttempts})`, retryEvent.errorMessage);
-            queue.enqueue(() => ctx.respond(formatProgressEntry("assistant", `Retrying (${retryEvent.attempt}/${retryEvent.maxAttempts})...`), false), "retry");
+        const available = availableModels.length > 0 ? formatModelList(availableModels, currentModel, 10) : "- (none)";
+        if (match.ambiguous) {
+            await this.sendCommandReply(ctx, `未切换模型：\`${args.trim()}\` 匹配到多个模型。请改用精确的 \`provider/modelId\` 形式。\n\nAvailable models:\n${available}`);
+            return;
         }
-    });
-    return {
-        async handleBuiltinCommand(ctx, command) {
-            await handleBuiltInCommand(ctx, command);
-        },
-        async queueSteer(text) {
-            await queueBusyMessage("steer", requireQueuedMessage(text, "steer"));
-        },
-        async queueFollowUp(text) {
-            await queueBusyMessage("followUp", requireQueuedMessage(text, "followup"));
-        },
-        async run(ctx, _store) {
-            // Reset per-run state
-            runState.ctx = ctx;
-            runState.logCtx = {
-                channelId: ctx.message.channel,
-                userName: ctx.message.userName,
-                channelName: ctx.channelName,
-            };
-            runState.pendingTools.clear();
-            runState.totalUsage = {
-                input: 0,
-                output: 0,
-                cacheRead: 0,
-                cacheWrite: 0,
-                cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-            };
-            runState.stopReason = "stop";
-            runState.errorMessage = undefined;
-            runState.finalOutcome = { kind: "none" };
-            runState.finalResponseDelivered = false;
-            // Create queue for this run
-            let queueChain = Promise.resolve();
-            runState.queue = {
-                enqueue(fn, errorContext) {
-                    queueChain = queueChain.then(async () => {
-                        try {
-                            await fn();
-                        }
-                        catch (err) {
-                            const errMsg = err instanceof Error ? err.message : String(err);
-                            log.logWarning(`DingTalk API error (${errorContext})`, errMsg);
-                        }
-                    });
-                },
-                enqueueMessage(text, target, errorContext, doLog = true) {
-                    this.enqueue(() => (target === "main" ? ctx.respond(text, doLog) : ctx.respondInThread(text)), errorContext);
-                },
-            };
-            try {
-                // Ensure channel directory exists
-                await mkdir(channelDir, { recursive: true });
-                // Update system prompt and runtime resources with fresh config
-                const soul = getSoul(workspaceDir);
-                const agentConfig = getAgentConfig(channelDir);
-                const memory = getMemory(channelDir);
-                const skills = loadPipiclawSkills(channelDir, workspacePath);
-                currentSkills = skills;
-                const systemPrompt = buildSystemPrompt(workspacePath, channelId, soul, agentConfig, memory, sandboxConfig, skills);
-                session.agent.setSystemPrompt(systemPrompt);
-                await session.reload();
-                // Sync messages from log.jsonl
-                const syncedCount = syncLogToSessionManager(sessionManager, channelDir, ctx.message.ts);
-                if (syncedCount > 0) {
-                    log.logInfo(`[${channelId}] Synced ${syncedCount} messages from log.jsonl`);
+        await this.sendCommandReply(ctx, `未找到模型 \`${args.trim()}\`。请使用精确的 \`provider/modelId\` 或唯一的 \`modelId\`。\n\nAvailable models:\n${available}`);
+    }
+    resetRunState(ctx) {
+        this.runState = createEmptyRunState();
+        this.runState.ctx = ctx;
+        this.runState.logCtx = {
+            channelId: ctx.message.channel,
+            userName: ctx.message.userName,
+            channelName: ctx.channelName,
+        };
+    }
+    // === Session event subscription ===
+    subscribeToSessionEvents() {
+        this.session.subscribe(async (event) => {
+            if (!this.runState.ctx || !this.runState.logCtx || !this.runState.queue)
+                return;
+            const { ctx, logCtx, queue, pendingTools } = this.runState;
+            if (event.type === "tool_execution_start") {
+                const agentEvent = event;
+                const args = agentEvent.args;
+                const label = args.label || agentEvent.toolName;
+                pendingTools.set(agentEvent.toolCallId, {
+                    toolName: agentEvent.toolName,
+                    args: agentEvent.args,
+                    startTime: Date.now(),
+                });
+                log.logToolStart(logCtx, agentEvent.toolName, label, agentEvent.args);
+                queue.enqueue(() => ctx.respond(formatProgressEntry("tool", label), false), "tool label");
+            }
+            else if (event.type === "tool_execution_end") {
+                const agentEvent = event;
+                const resultStr = extractToolResultText(agentEvent.result);
+                const pending = pendingTools.get(agentEvent.toolCallId);
+                pendingTools.delete(agentEvent.toolCallId);
+                const durationMs = pending ? Date.now() - pending.startTime : 0;
+                if (agentEvent.isError) {
+                    log.logToolError(logCtx, agentEvent.toolName, durationMs, resultStr);
                 }
-                // Reload messages from context.jsonl
-                const reloadedSession = sessionManager.buildSessionContext();
-                if (reloadedSession.messages.length > 0) {
-                    agent.replaceMessages(reloadedSession.messages);
-                    log.logInfo(`[${channelId}] Reloaded ${reloadedSession.messages.length} messages from context`);
+                else {
+                    log.logToolSuccess(logCtx, agentEvent.toolName, durationMs, resultStr);
                 }
-                // Log context info
-                log.logInfo(`Context sizes - system: ${systemPrompt.length} chars, memory: ${memory.length} chars`);
-                // Build user message with timestamp and username prefix
-                const now = new Date();
-                const pad = (n) => n.toString().padStart(2, "0");
-                const offset = -now.getTimezoneOffset();
-                const offsetSign = offset >= 0 ? "+" : "-";
-                const offsetHours = pad(Math.floor(Math.abs(offset) / 60));
-                const offsetMins = pad(Math.abs(offset) % 60);
-                const timestamp = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}${offsetSign}${offsetHours}:${offsetMins}`;
-                const userMessage = `[${timestamp}] [${ctx.message.userName || "unknown"}]: ${ctx.message.text}`;
-                // Debug: write context to last_prompt.json (only with PIPICLAW_DEBUG=1)
-                if (process.env.PIPICLAW_DEBUG) {
-                    const debugContext = {
-                        systemPrompt,
-                        messages: session.messages,
-                        newUserMessage: userMessage,
-                    };
-                    await writeFile(join(channelDir, "last_prompt.json"), JSON.stringify(debugContext, null, 2));
+                if (agentEvent.isError) {
+                    queue.enqueue(() => ctx.respond(formatProgressEntry("error", truncate(resultStr, 200)), false), "tool error");
                 }
-                await session.prompt(userMessage);
             }
-            catch (err) {
-                runState.stopReason = "error";
-                runState.errorMessage = err instanceof Error ? err.message : String(err);
-                log.logWarning(`[${channelId}] Runner failed`, runState.errorMessage);
+            else if (event.type === "message_start") {
+                const agentEvent = event;
+                if (agentEvent.message.role === "assistant") {
+                    log.logResponseStart(logCtx);
+                }
             }
-            finally {
-                await queueChain;
-                const finalOutcome = runState.finalOutcome;
-                const finalOutcomeText = getFinalOutcomeText(finalOutcome);
-                try {
-                    if (runState.stopReason === "error" && runState.errorMessage && !runState.finalResponseDelivered) {
-                        try {
-                            await ctx.replaceMessage("_Sorry, something went wrong_");
-                        }
-                        catch (err) {
-                            const errMsg = err instanceof Error ? err.message : String(err);
-                            log.logWarning("Failed to post error message", errMsg);
-                        }
+            else if (event.type === "message_end") {
+                const agentEvent = event;
+                if (agentEvent.message.role === "assistant") {
+                    const assistantMsg = agentEvent.message;
+                    if (assistantMsg.stopReason) {
+                        this.runState.stopReason = assistantMsg.stopReason;
                     }
-                    else if (isSilentOutcome(finalOutcome)) {
-                        try {
-                            await ctx.deleteMessage();
-                            log.logInfo("Silent response - deleted message");
-                        }
-                        catch (err) {
-                            const errMsg = err instanceof Error ? err.message : String(err);
-                            log.logWarning("Failed to delete message for silent response", errMsg);
-                        }
+                    if (assistantMsg.errorMessage) {
+                        this.runState.errorMessage = assistantMsg.errorMessage;
+                    }
+                    if (assistantMsg.usage) {
+                        this.runState.totalUsage.input += assistantMsg.usage.input;
+                        this.runState.totalUsage.output += assistantMsg.usage.output;
+                        this.runState.totalUsage.cacheRead += assistantMsg.usage.cacheRead;
+                        this.runState.totalUsage.cacheWrite += assistantMsg.usage.cacheWrite;
+                        this.runState.totalUsage.cost.input += assistantMsg.usage.cost.input;
+                        this.runState.totalUsage.cost.output += assistantMsg.usage.cost.output;
+                        this.runState.totalUsage.cost.cacheRead += assistantMsg.usage.cost.cacheRead;
+                        this.runState.totalUsage.cost.cacheWrite += assistantMsg.usage.cost.cacheWrite;
+                        this.runState.totalUsage.cost.total += assistantMsg.usage.cost.total;
                     }
-                    else if (finalOutcomeText && !runState.finalResponseDelivered) {
-                        try {
-                            await ctx.replaceMessage(finalOutcomeText);
+                    const content = agentEvent.message.content;
+                    const thinkingParts = [];
+                    const textParts = [];
+                    let hasToolCalls = false;
+                    for (const part of content) {
+                        if (part.type === "thinking") {
+                            thinkingParts.push(part.thinking);
+                        }
+                        else if (part.type === "text") {
+                            textParts.push(part.text);
                         }
-                        catch (err) {
-                            const errMsg = err instanceof Error ? err.message : String(err);
-                            log.logWarning("Failed to replace message with final text", errMsg);
+                        else if (part.type === "toolCall") {
+                            hasToolCalls = true;
                         }
                     }
-                    await ctx.flush();
+                    const text = textParts.join("\n");
+                    for (const thinking of thinkingParts) {
+                        log.logThinking(logCtx, thinking);
+                        queue.enqueue(() => ctx.respond(formatProgressEntry("thinking", thinking), false), "thinking");
+                    }
+                    if (hasToolCalls && text.trim()) {
+                        queue.enqueue(() => ctx.respond(formatProgressEntry("assistant", text), false), "assistant progress");
+                    }
+                }
+            }
+            else if (event.type === "turn_end") {
+                const turnEvent = event;
+                if (turnEvent.message.role === "assistant" && turnEvent.toolResults.length === 0) {
+                    if (turnEvent.message.stopReason === "error" || turnEvent.message.stopReason === "aborted") {
+                        return;
+                    }
+                    const finalContent = turnEvent.message.content;
+                    const finalText = finalContent
+                        .filter((part) => part.type === "text" && !!part.text)
+                        .map((part) => part.text)
+                        .join("\n");
+                    const trimmedFinalText = finalText.trim();
+                    if (!trimmedFinalText) {
+                        return;
+                    }
+                    if (trimmedFinalText === "[SILENT]" || trimmedFinalText.startsWith("[SILENT]")) {
+                        this.runState.finalOutcome = { kind: "silent" };
+                        return;
+                    }
+                    if (this.runState.finalOutcome.kind === "final" &&
+                        this.runState.finalOutcome.text.trim() === trimmedFinalText) {
+                        return;
+                    }
+                    this.runState.finalOutcome = { kind: "final", text: finalText };
+                    log.logResponse(logCtx, finalText);
+                    queue.enqueue(async () => {
+                        const delivered = await ctx.respondPlain(finalText);
+                        if (delivered) {
+                            this.runState.finalResponseDelivered = true;
+                        }
+                    }, "final response");
                 }
-                finally {
-                    await ctx.close();
+            }
+            else if (event.type === "auto_compaction_start") {
+                log.logInfo(`Auto-compaction started (reason: ${event.reason})`);
+                queue.enqueue(() => ctx.respond(formatProgressEntry("assistant", "Compacting context..."), false), "compaction start");
+            }
+            else if (event.type === "auto_compaction_end") {
+                const compEvent = event;
+                if (compEvent.result) {
+                    log.logInfo(`Auto-compaction complete: ${compEvent.result.tokensBefore} tokens compacted`);
                 }
-                // Log usage summary
-                if (runState.totalUsage.cost.total > 0) {
-                    const messages = session.messages;
-                    const lastAssistantMessage = messages
-                        .slice()
-                        .reverse()
-                        .find((m) => m.role === "assistant" && m.stopReason !== "aborted");
-                    const contextTokens = lastAssistantMessage
-                        ? lastAssistantMessage.usage.input +
-                            lastAssistantMessage.usage.output +
-                            lastAssistantMessage.usage.cacheRead +
-                            lastAssistantMessage.usage.cacheWrite
-                        : 0;
-                    const currentRunModel = session.model ?? activeModel;
-                    const contextWindow = currentRunModel.contextWindow || 200000;
-                    log.logUsageSummary(runState.logCtx, runState.totalUsage, contextTokens, contextWindow);
+                else if (compEvent.aborted) {
+                    log.logInfo("Auto-compaction aborted");
                 }
-                // Clear run state
-                runState.ctx = null;
-                runState.logCtx = null;
-                runState.queue = null;
             }
-            return { stopReason: runState.stopReason, errorMessage: runState.errorMessage };
-        },
-        abort() {
-            session.abort();
-        },
-    };
-}
-/**
- * Translate container path back to host path for file operations
- */
-export function translateToHostPath(containerPath, channelDir, workspacePath, channelId) {
-    if (workspacePath === "/workspace") {
-        const prefix = `/workspace/${channelId}/`;
-        if (containerPath.startsWith(prefix)) {
-            return join(channelDir, containerPath.slice(prefix.length));
-        }
-        if (containerPath.startsWith("/workspace/")) {
-            return join(channelDir, "..", containerPath.slice("/workspace/".length));
-        }
+            else if (event.type === "auto_retry_start") {
+                const retryEvent = event;
+                log.logWarning(`Retrying (${retryEvent.attempt}/${retryEvent.maxAttempts})`, retryEvent.errorMessage);
+                queue.enqueue(() => ctx.respond(formatProgressEntry("assistant", `Retrying (${retryEvent.attempt}/${retryEvent.maxAttempts})...`), false), "retry");
+            }
+        });
     }
-    return containerPath;
+}
+// ============================================================================
+// Factory
+// ============================================================================
+const channelRunners = new Map();
+export function getOrCreateRunner(sandboxConfig, channelId, channelDir) {
+    const existing = channelRunners.get(channelId);
+    if (existing)
+        return existing;
+    const runner = new ChannelRunner(sandboxConfig, channelId, channelDir);
+    channelRunners.set(channelId, runner);
+    return runner;
 }
 //# sourceMappingURL=agent.js.map