pulseed 0.4.20 → 0.5.0

package/dist/interface/chat/chat-runner.js

@@ -5,25 +5,25 @@
 import { execFile } from "node:child_process";
 import * as fsp from "node:fs/promises";
 import * as path from "node:path";
+import { getPulseedDirPath } from "../../base/utils/paths.js";
 import { loadProviderConfig } from "../../base/llm/provider-config.js";
+import { TaskSchema } from "../../base/types/task.js";
 import { ChatHistory } from "./chat-history.js";
 import { ChatSessionCatalog, ChatSessionSelectorError, } from "./chat-session-store.js";
 import { buildChatContext, resolveGitRoot } from "../../platform/observation/context-provider.js";
-import { buildDynamicContextPrompt, buildStaticSystemPrompt } from "./grounding.js";
+import { buildChatAgentLoopSystemPrompt, buildStaticSystemPrompt, createChatGroundingGateway } from "./grounding.js";
 import { verifyChatAction } from "./chat-verifier.js";
 import { toToolDefinitionsFiltered } from "../../tools/tool-definition-adapter.js";
 import { TendCommand } from "./tend-command.js";
 import { EventSubscriber } from "./event-subscriber.js";
 import { buildPromptedToolProtocolSystemPrompt, extractPromptedToolCalls, } from "../../orchestrator/execution/agent-loop/prompted-tool-protocol.js";
-import { recognizeRuntimeControlIntent } from "../../runtime/control/index.js";
-import { formatAgentLoopResolvedProfileSummary, resolveAgentLoopDefaultProfile, summarizeAgentLoopResolvedProfile, } from "../../orchestrator/execution/agent-loop/agent-loop-default-profile.js";
-import { summarizeExecutionPolicy, withExecutionPolicyOverrides, } from "../../orchestrator/execution/agent-loop/execution-policy.js";
-import { ChatStateService } from "./chat-state-service.js";
+import { resolveExecutionPolicy, summarizeExecutionPolicy, withExecutionPolicyOverrides, } from "../../orchestrator/execution/agent-loop/execution-policy.js";
+import { buildStandaloneIngressMessage, createIngressRouter, } from "./ingress-router.js";
 const DEFAULT_TIMEOUT_MS = 120_000;
 const MAX_VERIFY_RETRIES = 2;
 const MAX_TOOL_LOOPS = 5;
 const ACTIVITY_PREVIEW_CHARS = 40;
-const DIRECT_ANSWER_MAX_TOKENS = 256;
+const standaloneIngressRouter = createIngressRouter();
 // ─── Command help text ───
 const COMMAND_HELP = `Available commands:
 Session
@@ -76,32 +76,10 @@ function formatToolActivity(action, toolName, detail) {
     const preview = detail ? previewActivityText(detail) : "";
     return preview ? `${action} tool: ${toolName} - ${preview}` : `${action} tool: ${toolName}`;
 }
-function shouldUseDirectAnswerRoute(input) {
-    const normalized = input.trim();
-    if (!normalized)
-        return false;
-    const lowered = normalized.toLowerCase();
-    const questionSignals = [
-        /[?？]/,
-        /\b(what|why|how|when|where|who|which|is|are|can|could|would|should|tell me|explain|describe|help me understand)\b/,
-        /(教えて|説明して|教えてください|説明してください|どう思う|なんで|なぜ|どうして|いつ|どこ|だれ|誰|何|どれ|どっち)/,
-    ];
-    if (!questionSignals.some((pattern) => pattern.test(lowered))) {
-        return false;
-    }
-    const workSignals = [
-        /\b(fix|implement|change|changed|add|remove|delete|update|refactor|patch|debug|diagnose|investigate|review|write|create|build|run|execute|test|verify|confirm|check|inspect|search|open|read|edit|modify|commit|push|merge|release|deploy|start|stop|restart|resume|compare|convert|migrate|optimize|improve|configure|setup|set up)\b/,
-        /(修正|実装|変更|追加|削除|更新|リファクタ|デバッグ|調査|確認|レビュー|書いて|作って|作成|実行|走らせ|テスト|検証|調べて|開いて|読んで|編集|コミット|プッシュ|マージ|デプロイ|再起動|再開|設定)/,
-        /\b(git|repo|repository|branch|commit|diff|pull request|pr|issue|ticket|adapter|agentloop|tool|tools|code)\b|コード|src\//,
-        /\b(latest|most recent|current|today|now|recent|news|web|internet|api|docs|github|release|version)\b|最新|最新版|今日|現在|最近|今|外部|ネット/,
-        /\bwhat\s+(files?\s+)?changed\b|\bwhich\s+files?\s+(changed|were\s+(modified|edited))\b/,
-        /(\.(ts|tsx|js|jsx|json|md|yml|yaml|toml|py|go|rs|sh|sql)\b|\/[^/\s]+\.[A-Za-z0-9]+$)/,
-    ];
-    return !workSignals.some((pattern) => pattern.test(lowered));
-}
 // ─── ChatRunner ───
 export class ChatRunner {
     deps;
+    groundingGateway;
     history = null;
     sessionCwd = null;
     /** True when startSession() has been called — enables session persistence across execute() calls. */
@@ -123,10 +101,12 @@ export class ChatRunner {
     nativeAgentLoopStatePath = null;
     runtimeControlContext = null;
     sessionExecutionPolicy = null;
-    stateView;
     constructor(deps) {
         this.deps = deps;
-        this.stateView = new ChatStateService(deps.stateManager);
+        this.groundingGateway = createChatGroundingGateway({
+            stateManager: deps.stateManager,
+            pluginLoader: deps.pluginLoader,
+        });
     }
     /**
      * Initialize a persistent session for interactive (multi-turn) mode.
@@ -161,6 +141,69 @@ export class ChatRunner {
     setRuntimeControlContext(context) {
         this.runtimeControlContext = context;
     }
+    async executeIngressMessage(ingress, cwd, timeoutMs = DEFAULT_TIMEOUT_MS, selectedRoute) {
+        if (!selectedRoute) {
+            throw new Error("executeIngressMessage requires selectedRoute; use CrossPlatformChatSessionManager for ingress route selection.");
+        }
+        const runtimeControlContext = this.buildRuntimeControlContextFromIngress(ingress);
+        return this.execute(ingress.text, cwd, timeoutMs, { selectedRoute, runtimeControlContext });
+    }
+    resolveRouteFromIngress(ingress) {
+        return standaloneIngressRouter.selectRoute(ingress, this.getRouteCapabilities());
+    }
+    resolveRouteFromInput(input, runtimeControlContext) {
+        return this.resolveRouteFromIngress(this.buildStandaloneIngressMessage(input, runtimeControlContext));
+    }
+    getRouteCapabilities() {
+        return {
+            hasLightweightLlm: this.deps.llmClient !== undefined,
+            hasAgentLoop: this.deps.chatAgentLoopRunner !== undefined,
+            hasToolLoop: this.deps.llmClient !== undefined,
+            hasRuntimeControlService: this.deps.runtimeControlService !== undefined,
+        };
+    }
+    buildStandaloneIngressMessage(input, runtimeControlContext) {
+        const channel = runtimeControlContext?.replyTarget?.surface === "tui"
+            ? "tui"
+            : runtimeControlContext?.replyTarget?.surface === "cli"
+                ? "cli"
+                : runtimeControlContext?.replyTarget?.surface === "gateway"
+                    ? "plugin_gateway"
+                    : "cli";
+        const runtimeApprovalFn = runtimeControlContext?.approvalFn
+            ?? this.deps.runtimeControlApprovalFn
+            ?? this.deps.approvalFn;
+        return buildStandaloneIngressMessage({
+            text: input,
+            channel,
+            platform: runtimeControlContext?.replyTarget?.platform ?? this.deps.runtimeReplyTarget?.platform,
+            identity_key: runtimeControlContext?.replyTarget?.identity_key ?? this.deps.runtimeReplyTarget?.identity_key,
+            conversation_id: runtimeControlContext?.replyTarget?.conversation_id ?? this.deps.runtimeReplyTarget?.conversation_id,
+            user_id: runtimeControlContext?.replyTarget?.user_id ?? this.deps.runtimeReplyTarget?.user_id,
+            actor: runtimeControlContext?.actor ?? this.deps.runtimeControlActor,
+            replyTarget: runtimeControlContext?.replyTarget ?? this.deps.runtimeReplyTarget,
+            runtimeControl: {
+                allowed: true,
+                approvalMode: "interactive",
+            },
+        });
+    }
+    buildRuntimeControlContextFromIngress(ingress) {
+        if (!ingress.actor && !ingress.replyTarget)
+            return null;
+        const interactiveApproval = this.runtimeControlContext?.approvalFn
+            ?? this.deps.runtimeControlApprovalFn
+            ?? this.deps.approvalFn;
+        return {
+            actor: ingress.actor,
+            replyTarget: ingress.replyTarget,
+            approvalFn: ingress.runtimeControl.approvalMode === "preapproved"
+                ? async () => true
+                : ingress.runtimeControl.approvalMode === "interactive"
+                    ? interactiveApproval
+                    : undefined,
+        };
+    }
     loadedSessionToChatSession(session) {
         return {
             id: session.id,
@@ -177,7 +220,6 @@ export class ChatRunner {
             ...(session.agentLoopResumable ? { agentLoopResumable: true } : {}),
             ...(session.agentLoopUpdatedAt ? { agentLoopUpdatedAt: session.agentLoopUpdatedAt } : {}),
             ...(session.agentLoop ? { agentLoop: session.agentLoop } : {}),
-            ...(session.usage ? { usage: session.usage } : {}),
         };
     }
     formatSessionsList(entries) {
@@ -202,13 +244,53 @@ export class ChatRunner {
         return `Session ${session.id}${title} (${session.cwd})\n${lines.join("\n")}`;
     }
     async loadGoals() {
-        return this.stateView.loadGoals();
+        const goalIds = await this.deps.stateManager.listGoalIds();
+        const goals = await Promise.all(goalIds.map((id) => this.deps.stateManager.loadGoal(id)));
+        return goals.filter((goal) => goal !== null);
     }
     async listAllGoalIds() {
-        return this.stateView.listAllGoalIds();
+        const activeIds = await this.deps.stateManager.listGoalIds();
+        const archivedIds = await this.deps.stateManager.listArchivedGoals();
+        const recoverableArchivedIds = await this.listRecoverableArchivedGoalIds();
+        return [...new Set([...activeIds, ...archivedIds, ...recoverableArchivedIds])];
+    }
+    resolveStatePath(baseDir, ...segments) {
+        const base = path.resolve(baseDir);
+        const resolved = path.resolve(base, ...segments);
+        if (!resolved.startsWith(base + path.sep))
+            return null;
+        return resolved;
+    }
+    async listRecoverableArchivedGoalIds() {
+        const stateManager = this.deps.stateManager;
+        if (typeof stateManager.getBaseDir !== "function")
+            return [];
+        const archiveDir = this.resolveStatePath(stateManager.getBaseDir(), "archive");
+        if (archiveDir === null)
+            return [];
+        let entries = [];
+        try {
+            entries = await fsp.readdir(archiveDir, { withFileTypes: true });
+        }
+        catch {
+            return [];
+        }
+        const goalIds = [];
+        for (const entry of entries) {
+            if (!entry.isDirectory() || entry.name === ".staging")
+                continue;
+            try {
+                await fsp.access(path.join(archiveDir, entry.name, "goal", "goal.json"));
+                goalIds.push(entry.name);
+            }
+            catch {
+                continue;
+            }
+        }
+        return goalIds;
     }
     activeGoals(goals) {
-        return this.stateView.activeGoals(goals);
+        return goals.filter((goal) => goal.status === "active" || goal.status === "waiting" || goal.loop_status === "running");
     }
     formatGoalLine(goal) {
         const dimensions = goal.dimensions.length === 0
@@ -259,8 +341,44 @@ export class ChatRunner {
             elapsed_ms: Date.now() - start,
         };
     }
+    async readTasksFromDir(tasksDir) {
+        let entries = [];
+        try {
+            entries = await fsp.readdir(tasksDir);
+        }
+        catch {
+            return [];
+        }
+        const tasks = [];
+        for (const entry of entries) {
+            if (!entry.endsWith(".json") || entry === "task-history.json" || entry === "last-failure-context.json")
+                continue;
+            let raw;
+            try {
+                raw = JSON.parse(await fsp.readFile(path.join(tasksDir, entry), "utf-8"));
+            }
+            catch {
+                continue;
+            }
+            const parsed = TaskSchema.safeParse(raw);
+            if (parsed.success)
+                tasks.push(parsed.data);
+        }
+        return tasks.sort((a, b) => (a.created_at < b.created_at ? 1 : -1));
+    }
     async readTasksForGoal(goalId) {
-        return this.stateView.readTasksForGoal(goalId);
+        const stateManager = this.deps.stateManager;
+        if (typeof stateManager.getBaseDir !== "function")
+            return [];
+        const baseDir = stateManager.getBaseDir();
+        const activeTasksDir = this.resolveStatePath(baseDir, "tasks", goalId);
+        const archiveTasksDir = this.resolveStatePath(baseDir, "archive", goalId, "tasks");
+        if (activeTasksDir === null || archiveTasksDir === null)
+            return [];
+        const activeTasks = await this.readTasksFromDir(activeTasksDir);
+        if (activeTasks.length > 0)
+            return activeTasks;
+        return this.readTasksFromDir(archiveTasksDir);
     }
     async resolveGoalForTasks(selector) {
         if (selector)
@@ -302,7 +420,28 @@ export class ChatRunner {
         return { taskId: parts[0], goalId: parts[1] };
     }
     async findTask(taskId, goalId) {
-        return this.stateView.findTask(taskId, goalId);
+        const goalIds = goalId ? [goalId] : await this.listAllGoalIds();
+        const matches = [];
+        for (const candidateGoalId of goalIds) {
+            let raw = null;
+            try {
+                raw = await this.deps.stateManager.readRaw(`tasks/${candidateGoalId}/${taskId}.json`);
+            }
+            catch {
+                raw = null;
+            }
+            if (!raw) {
+                const tasks = await this.readTasksForGoal(candidateGoalId);
+                const matched = tasks.find((task) => task.id === taskId || task.id.startsWith(taskId));
+                if (matched)
+                    matches.push({ goalId: candidateGoalId, task: matched });
+                continue;
+            }
+            const parsed = TaskSchema.safeParse(raw);
+            if (parsed.success)
+                matches.push({ goalId: candidateGoalId, task: parsed.data });
+        }
+        return { task: matches.length === 1 ? matches[0].task : undefined, matches };
     }
     formatTask(task) {
         const lines = [
@@ -347,11 +486,30 @@ export class ChatRunner {
         }
         return { success: true, output: this.formatTask(found.task), elapsed_ms: Date.now() - start };
     }
+    providerConfigBaseDir() {
+        const stateManager = this.deps.stateManager;
+        return typeof stateManager.getBaseDir === "function" ? stateManager.getBaseDir() : getPulseedDirPath();
+    }
     async readProviderConfigSummary() {
-        return this.stateView.readProviderConfigSummary();
+        const config = await loadProviderConfig({
+            baseDir: this.providerConfigBaseDir(),
+            saveMigration: false,
+        });
+        return {
+            provider: config.provider,
+            model: config.model,
+            adapter: config.adapter,
+            light_model: config.light_model,
+            base_url: config.base_url,
+            codex_cli_path: config.codex_cli_path,
+            has_api_key: Boolean(config.api_key),
+        };
     }
     formatConfig(config) {
-        return this.stateView.formatConfig(config);
+        return Object.entries(config)
+            .filter(([, value]) => value !== undefined)
+            .map(([key, value]) => `${key}: ${typeof value === "string" && /key|token|secret/i.test(key) ? "[masked]" : String(value)}`)
+            .join("\n");
     }
     async handleConfig(start) {
         const config = await this.readProviderConfigSummary();
@@ -394,11 +552,7 @@ export class ChatRunner {
         const totalTokens = Number.isFinite(usage.totalTokens)
             ? Math.max(0, Math.floor(usage.totalTokens))
             : inputTokens + outputTokens;
-        return {
-            inputTokens,
-            outputTokens,
-            totalTokens,
-        };
+        return { inputTokens, outputTokens, totalTokens };
     }
     usageFromLLMResponse(response) {
         const inputTokens = response.usage?.input_tokens ?? 0;
@@ -776,7 +930,7 @@ export class ChatRunner {
         if (!args) {
             return {
                 success: true,
-                output: this.formatExecutionPolicyOutput(summarizeExecutionPolicy(policy), "Profile", await this.getAgentLoopProfileSummary("chat", policy)),
+                output: summarizeExecutionPolicy(policy),
                 elapsed_ms: Date.now() - start,
             };
         }
@@ -818,15 +972,17 @@ export class ChatRunner {
         this.sessionExecutionPolicy = nextPolicy;
         return {
             success: true,
-            output: this.formatExecutionPolicyOutput(summarizeExecutionPolicy(nextPolicy), "Profile", await this.getAgentLoopProfileSummary("chat", nextPolicy)),
+            output: summarizeExecutionPolicy(nextPolicy),
             elapsed_ms: Date.now() - start,
         };
     }
     async handleReview(start) {
         const cwd = this.sessionCwd ?? process.cwd();
         const diffStat = await checkGitChanges(cwd);
-        const reviewProfile = await this.getAgentLoopDefaultProfile("review");
-        const reviewPolicy = reviewProfile.executionPolicy ?? await this.getSessionExecutionPolicy();
+        const reviewPolicy = withExecutionPolicyOverrides(await this.getSessionExecutionPolicy(), {
+            sandboxMode: "read_only",
+            approvalPolicy: "never",
+        });
         if (this.deps.reviewAgentLoopRunner) {
             const review = await this.deps.reviewAgentLoopRunner.execute({
                 cwd,
@@ -841,9 +997,6 @@ export class ChatRunner {
             "",
             "Execution policy",
             summarizeExecutionPolicy(reviewPolicy),
-            "",
-            "Review profile",
-            formatAgentLoopResolvedProfileSummary(summarizeAgentLoopResolvedProfile(reviewProfile, reviewPolicy)),
         ].join("\n");
         return { success: true, output, elapsed_ms: Date.now() - start };
     }
@@ -957,32 +1110,47 @@ export class ChatRunner {
                 elapsed_ms: Date.now() - start,
             };
         }
-        try {
-            await this.deps.daemonClient.startGoal(pending.goalId);
-        }
-        catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
-            return {
-                success: false,
-                output: `Daemon unavailable: ${msg}. Start the daemon with 'pulseed daemon start' first.`,
-                elapsed_ms: Date.now() - start,
-            };
-        }
-        // Subscribe to EventServer progress notifications (non-blocking)
         const { goalId, maxIterations } = pending;
+        let subscriber = null;
         if (this.deps.daemonBaseUrl && !this.activeSubscribers.has(goalId)) {
-            const subscriber = new EventSubscriber(this.deps.daemonBaseUrl, goalId, "normal");
+            subscriber = new EventSubscriber(this.deps.daemonBaseUrl, goalId, "normal");
             this.activeSubscribers.set(goalId, subscriber);
             subscriber.on("notification", (notification) => {
                 const n = notification;
-                // Invoke both the deps callback (wired at construction) and the public
-                // onNotification property (wired post-construction, e.g. from React useEffect)
                 this.deps.onNotification?.(n.message);
                 this.onNotification?.(n.message);
             });
-            subscriber.subscribe().catch(() => {
-                // Connection failures are handled inside EventSubscriber
+            subscriber.on("chat_event", (event) => {
+                this.emitEvent(event);
             });
+            try {
+                await subscriber.subscribeReady();
+            }
+            catch (err) {
+                subscriber.unsubscribe();
+                this.activeSubscribers.delete(goalId);
+                const msg = err instanceof Error ? err.message : String(err);
+                return {
+                    success: false,
+                    output: `Daemon event stream unavailable: ${msg}. Goal was not started.`,
+                    elapsed_ms: Date.now() - start,
+                };
+            }
+        }
+        try {
+            await this.deps.daemonClient.startGoal(goalId);
+        }
+        catch (err) {
+            if (subscriber) {
+                subscriber.unsubscribe();
+                this.activeSubscribers.delete(goalId);
+            }
+            const msg = err instanceof Error ? err.message : String(err);
+            return {
+                success: false,
+                output: `Daemon unavailable: ${msg}. Start the daemon with 'pulseed daemon start' first.`,
+                elapsed_ms: Date.now() - start,
+            };
         }
         const iterNote = maxIterations !== undefined ? ` (max ${maxIterations} iterations)` : "";
         const shortId = goalId.length > 12 ? goalId.slice(0, 12) : goalId;
@@ -1004,10 +1172,11 @@ export class ChatRunner {
      *  6. Verify changes (git diff + tests); retry up to MAX_VERIFY_RETRIES if tests fail
      *  7. Persist assistant response only after the final assistant text is complete
      */
-    async execute(input, cwd, timeoutMs = DEFAULT_TIMEOUT_MS) {
+    async execute(input, cwd, timeoutMs = DEFAULT_TIMEOUT_MS, options = {}) {
         const eventContext = this.createEventContext();
         const resumeCommand = this.parseResumeCommand(input);
         const resumeOnly = resumeCommand !== null;
+        const runtimeControlContext = options.runtimeControlContext ?? this.runtimeControlContext;
         // Intercept commands before any adapter call
         const commandResult = resumeOnly ? null : await this.handleCommand(input);
         if (commandResult !== null) {
@@ -1036,21 +1205,6 @@ export class ChatRunner {
             this.emitLifecycleEndEvent(confirmationResult.success ? "completed" : "error", confirmationResult.elapsed_ms, eventContext, false);
             return confirmationResult;
         }
-        const runtimeControlResult = resumeOnly
-            ? null
-            : await this.handleRuntimeControlIntent(input, cwd, Date.now());
-        if (runtimeControlResult !== null) {
-            if (runtimeControlResult.output) {
-                this.emitEvent({
-                    type: "assistant_final",
-                    text: runtimeControlResult.output,
-                    persisted: false,
-                    ...this.eventBase(eventContext),
-                });
-            }
-            this.emitLifecycleEndEvent(runtimeControlResult.success ? "completed" : "error", runtimeControlResult.elapsed_ms, eventContext, false);
-            return runtimeControlResult;
-        }
         if (resumeOnly && resumeCommand.selector) {
             try {
                 const catalog = new ChatSessionCatalog(this.deps.stateManager);
@@ -1127,18 +1281,39 @@ export class ChatRunner {
         if (historySections.length > 0) {
             historyBlock = `${historySections.join("\n\n")}\n\nCurrent message:\n`;
         }
-        const directAnswerRoute = !resumeOnly && !this.deps.chatAgentLoopRunner && this.deps.llmClient !== undefined && shouldUseDirectAnswerRoute(input);
+        const selectedRoute = resumeOnly
+            ? null
+            : (options.selectedRoute ?? this.resolveRouteFromInput(input, runtimeControlContext));
         const directPrompt = historyBlock ? `${historyBlock}${input}` : input;
         const start = Date.now();
         const assistantBuffer = { text: "" };
         const turnUsage = this.zeroUsageCounter();
-        if (directAnswerRoute) {
+        if (selectedRoute?.kind === "runtime_control") {
+            const runtimeControlResult = await this.executeRuntimeControlRoute(selectedRoute, runtimeControlContext, cwd, start);
+            if (runtimeControlResult.success) {
+                await history.appendAssistantMessage(runtimeControlResult.output);
+                this.emitActivity("lifecycle", "Finalizing response...", eventContext, "lifecycle:finalizing");
+                this.emitEvent({
+                    type: "assistant_final",
+                    text: runtimeControlResult.output,
+                    persisted: true,
+                    ...this.eventBase(eventContext),
+                });
+                this.emitLifecycleEndEvent("completed", runtimeControlResult.elapsed_ms, eventContext, true);
+            }
+            else {
+                this.emitLifecycleErrorEvent(runtimeControlResult.output, assistantBuffer.text, eventContext);
+                this.emitLifecycleEndEvent("error", runtimeControlResult.elapsed_ms, eventContext, false);
+            }
+            return runtimeControlResult;
+        }
+        if (selectedRoute?.kind === "direct_answer") {
             try {
                 this.emitActivity("lifecycle", "Calling model...", eventContext, "lifecycle:model");
                 const directResponse = await this.sendLLMMessage(this.deps.llmClient, [{ role: "user", content: directPrompt }], {
                     ...(this.cachedStaticSystemPrompt ? { system: this.cachedStaticSystemPrompt } : {}),
-                    model_tier: "light",
-                    max_tokens: DIRECT_ANSWER_MAX_TOKENS,
+                    model_tier: selectedRoute.modelTier,
+                    max_tokens: selectedRoute.maxTokens,
                 }, assistantBuffer, eventContext);
                 this.addUsageCounter(turnUsage, this.usageFromLLMResponse(directResponse));
                 const elapsed_ms = Date.now() - start;
@@ -1161,9 +1336,9 @@ export class ChatRunner {
                     elapsed_ms,
                     diagnostics: {
                         route: "direct",
-                        reason: "simple_question",
-                        modelTier: "light",
-                        maxTokens: DIRECT_ANSWER_MAX_TOKENS,
+                        reason: selectedRoute.reason,
+                        modelTier: selectedRoute.modelTier,
+                        maxTokens: selectedRoute.maxTokens,
                     },
                 };
             }
@@ -1179,25 +1354,49 @@ export class ChatRunner {
                     elapsed_ms: Date.now() - start,
                     diagnostics: {
                         route: "direct",
-                        reason: "simple_question",
-                        modelTier: "light",
-                        maxTokens: DIRECT_ANSWER_MAX_TOKENS,
+                        reason: selectedRoute.reason,
+                        modelTier: selectedRoute.modelTier,
+                        maxTokens: selectedRoute.maxTokens,
                     },
                 };
             }
         }
-        let dynamicSystemPrompt = "";
-        try {
-            this.emitActivity("lifecycle", "Preparing context...", eventContext, "lifecycle:context");
-            dynamicSystemPrompt = await buildDynamicContextPrompt({ stateManager: this.deps.stateManager });
-        }
-        catch {
-            dynamicSystemPrompt = "";
+        const usesNativeAgentLoop = resumeOnly || selectedRoute?.kind === "agent_loop";
+        const groundingWorkspaceContext = !resumeOnly && usesNativeAgentLoop
+            ? await buildChatContext(input, cwd)
+            : undefined;
+        let systemPrompt = this.cachedStaticSystemPrompt ?? "";
+        if (!resumeOnly) {
+            try {
+                this.emitActivity("lifecycle", "Preparing context...", eventContext, "lifecycle:context");
+                if (usesNativeAgentLoop) {
+                    systemPrompt = await buildChatAgentLoopSystemPrompt({
+                        stateManager: this.deps.stateManager,
+                        pluginLoader: this.deps.pluginLoader,
+                        workspaceRoot: cwd,
+                        goalId: this.deps.goalId,
+                        userMessage: input,
+                        trustProjectInstructions: this.sessionExecutionPolicy?.trustProjectInstructions ?? true,
+                        workspaceContext: groundingWorkspaceContext,
+                    });
+                }
+                else {
+                    const groundingBundle = await this.groundingGateway.build({
+                        surface: "chat",
+                        purpose: "general_turn",
+                        workspaceRoot: cwd,
+                        goalId: this.deps.goalId,
+                        userMessage: input,
+                        query: input,
+                        trustProjectInstructions: this.sessionExecutionPolicy?.trustProjectInstructions ?? true,
+                    });
+                    systemPrompt = String(groundingBundle.render("prompt"));
+                }
+            }
+            catch {
+                systemPrompt = this.cachedStaticSystemPrompt ?? "";
+            }
         }
-        const systemPrompt = [this.cachedStaticSystemPrompt, dynamicSystemPrompt]
-            .filter((section) => section && section.trim().length > 0)
-            .join("\n\n")
-            .trim();
         const agentLoopSystemPrompt = [
             systemPrompt,
             compactionSummary ? `## Compacted Chat Summary\n${compactionSummary}` : "",
@@ -1205,7 +1404,7 @@ export class ChatRunner {
             .filter((section) => section && section.trim().length > 0)
             .join("\n\n")
             .trim();
-        const context = resumeOnly ? "" : await buildChatContext(input, gitRoot);
+        const context = resumeOnly || usesNativeAgentLoop ? "" : await buildChatContext(input, gitRoot);
         const basePrompt = resumeOnly ? "" : (context ? `${context}\n\n${input}` : input);
         const prompt = historyBlock ? `${historyBlock}${basePrompt}` : basePrompt;
         if (resumeOnly && !this.deps.chatAgentLoopRunner) {
@@ -1224,7 +1423,8 @@ export class ChatRunner {
                 elapsed_ms,
             };
         }
-        if (this.deps.chatAgentLoopRunner) {
+        const chatAgentLoopRunner = this.deps.chatAgentLoopRunner;
+        if (resumeOnly || selectedRoute?.kind === "agent_loop") {
             try {
                 const resumeState = resumeOnly ? await this.loadResumableAgentLoopState() : null;
                 if (resumeOnly && !resumeState) {
@@ -1244,7 +1444,7 @@ export class ChatRunner {
                     };
                 }
                 this.emitActivity("lifecycle", "Calling model...", eventContext, "lifecycle:model");
-                const result = await this.deps.chatAgentLoopRunner.execute({
+                const result = await chatAgentLoopRunner.execute({
                     message: basePrompt,
                     cwd,
                     goalId: this.deps.goalId,
@@ -1268,7 +1468,9 @@ export class ChatRunner {
                     ...(agentLoopSystemPrompt ? { systemPrompt: agentLoopSystemPrompt } : {}),
                 });
                 const elapsed_ms = Date.now() - start;
-                const agentLoopUsage = this.normalizeUsageCounter(result.agentLoop?.usage ?? this.zeroUsageCounter());
+                const agentLoopUsage = result.agentLoop?.usage
+                    ? this.normalizeUsageCounter(result.agentLoop.usage)
+                    : this.zeroUsageCounter();
                 if (this.hasUsage(agentLoopUsage)) {
                     history.recordUsage("agentloop", agentLoopUsage);
                 }
@@ -1287,9 +1489,6 @@ export class ChatRunner {
                     this.emitLifecycleEndEvent("completed", elapsed_ms, eventContext, true);
                 }
                 else {
-                    if (this.hasUsage(agentLoopUsage)) {
-                        await history.persist();
-                    }
                     this.emitLifecycleErrorEvent(result.output || result.error || "Unknown error", assistantBuffer.text, eventContext);
                     this.emitLifecycleEndEvent("error", elapsed_ms, eventContext, false);
                 }
@@ -1313,7 +1512,7 @@ export class ChatRunner {
             }
         }
         // Prefer the local LLM/tool loop over the external adapter fallback whenever a client is available.
-        if (this.deps.llmClient) {
+        if (selectedRoute?.kind === "tool_loop") {
             try {
                 const toolResult = await this.executeWithTools(prompt, eventContext, assistantBuffer, systemPrompt || undefined);
                 const elapsed_ms = Date.now() - start;
@@ -1344,6 +1543,17 @@ export class ChatRunner {
                 };
             }
         }
+        if (!resumeOnly && selectedRoute && selectedRoute.kind !== "adapter") {
+            const elapsed_ms = Date.now() - start;
+            const output = `Unsupported chat route: ${selectedRoute.kind}`;
+            this.emitLifecycleErrorEvent(output, assistantBuffer.text, eventContext);
+            this.emitLifecycleEndEvent("error", elapsed_ms, eventContext, false);
+            return {
+                success: false,
+                output,
+                elapsed_ms,
+            };
+        }
         const task = {
             prompt,
             timeout_ms: timeoutMs,
@@ -1413,10 +1623,7 @@ export class ChatRunner {
             elapsed_ms,
         };
     }
-    async handleRuntimeControlIntent(input, cwd, start) {
-        const intent = recognizeRuntimeControlIntent(input);
-        if (intent === null)
-            return null;
+    async executeRuntimeControlRoute(route, runtimeControlContext, cwd, start) {
         if (!this.deps.runtimeControlService) {
             return {
                 success: false,
@@ -1424,10 +1631,10 @@ export class ChatRunner {
                 elapsed_ms: Date.now() - start,
             };
         }
-        const replyTarget = this.runtimeControlContext?.replyTarget ?? this.deps.runtimeReplyTarget;
-        const actor = this.runtimeControlContext?.actor ?? this.deps.runtimeControlActor;
+        const replyTarget = runtimeControlContext?.replyTarget ?? this.deps.runtimeReplyTarget;
+        const actor = runtimeControlContext?.actor ?? this.deps.runtimeControlActor;
         const result = await this.deps.runtimeControlService.request({
-            intent,
+            intent: route.intent,
             cwd,
             requestedBy: actor ?? {
                 surface: replyTarget?.surface ?? "chat",
@@ -1437,7 +1644,7 @@ export class ChatRunner {
                 user_id: replyTarget?.user_id,
             },
             replyTarget: replyTarget ?? { surface: "chat" },
-            approvalFn: this.runtimeControlContext?.approvalFn
+            approvalFn: runtimeControlContext?.approvalFn
                 ?? this.deps.runtimeControlApprovalFn
                 ?? this.deps.approvalFn,
         });
@@ -1470,13 +1677,13 @@ export class ChatRunner {
                         ? { tools, ...(systemPrompt ? { system: systemPrompt } : {}) }
                         : { system: buildPromptedToolProtocolSystemPrompt({ systemPrompt, tools }) }),
                 }, assistantBuffer, eventContext);
-                this.addUsageCounter(usage, this.usageFromLLMResponse(response));
             }
             catch (err) {
                 console.error("[chat-runner] executeWithTools error:", err);
                 const hint = err instanceof Error ? `: ${err.message}` : "";
                 throw new Error(`Sorry, I encountered an error processing your request${hint}.`);
             }
+            this.addUsageCounter(usage, this.usageFromLLMResponse(response));
             const toolCalls = response.tool_calls?.length
                 ? response.tool_calls
                 : supportsNativeToolCalling
@@ -1676,19 +1883,10 @@ export class ChatRunner {
             return null;
         if (raw.status === "completed")
             return null;
-        const usageCandidate = raw.usage;
-        const usage = usageCandidate
-            ? this.normalizeUsageCounter({
-                inputTokens: typeof usageCandidate.inputTokens === "number" ? usageCandidate.inputTokens : 0,
-                outputTokens: typeof usageCandidate.outputTokens === "number" ? usageCandidate.outputTokens : 0,
-                totalTokens: typeof usageCandidate.totalTokens === "number" ? usageCandidate.totalTokens : 0,
-            })
-            : this.zeroUsageCounter();
         return {
             ...raw,
             messages: [...raw.messages],
             calledTools: [...raw.calledTools],
-            usage,
         };
     }
     isAgentLoopSessionState(value) {
@@ -1928,27 +2126,12 @@ export class ChatRunner {
     async getSessionExecutionPolicy() {
         if (this.sessionExecutionPolicy)
             return this.sessionExecutionPolicy;
-        const profile = await this.getAgentLoopDefaultProfile("chat");
-        if (!profile.executionPolicy) {
-            throw new Error("Chat profile did not resolve an execution policy.");
-        }
-        this.sessionExecutionPolicy = profile.executionPolicy;
-        return this.sessionExecutionPolicy;
-    }
-    async getAgentLoopDefaultProfile(surface) {
         const config = await loadProviderConfig({ saveMigration: false });
-        return resolveAgentLoopDefaultProfile({
-            surface,
+        this.sessionExecutionPolicy = resolveExecutionPolicy({
             workspaceRoot: this.sessionCwd ?? process.cwd(),
             security: config.agent_loop?.security,
         });
-    }
-    async getAgentLoopProfileSummary(surface, executionPolicy) {
-        const profile = await this.getAgentLoopDefaultProfile(surface);
-        return formatAgentLoopResolvedProfileSummary(summarizeAgentLoopResolvedProfile(profile, executionPolicy));
-    }
-    formatExecutionPolicyOutput(policySummary, profileHeading, profileSummary) {
-        return [policySummary, "", profileHeading, profileSummary].join("\n");
+        return this.sessionExecutionPolicy;
     }
     async buildToolCallContext() {
         const executionPolicy = await this.getSessionExecutionPolicy();