chainlesschain 0.166.125 → 0.166.127

package/src/commands/session.js

@@ -106,8 +106,9 @@ function _sessionEpoch(ts) {
  * @returns {{statusBar:string, autoMerge:{allow:boolean,reason:string,unmet:string[]}, lines:string[]}}
  */
 export async function renderPrStatus(signals = {}, opts = {}) {
-  const { strictAutoMergeDecision, describePrStatusBar } =
-    await import("../lib/pr-automation-policy.js");
+  const { strictAutoMergeDecision, describePrStatusBar } = await import(
+    "../lib/pr-automation-policy.js"
+  );
   const autoMerge = strictAutoMergeDecision({
     enabled: opts.enabled === true,
     hasOpenPr: signals.hasOpenPr,
@@ -356,22 +357,25 @@ export function registerSessionCommand(program, dependencies = {}) {
           sourceErrors.local = error?.message || String(error);
         }
         try {
-          const { listBackgroundAgents } =
-            await import("../lib/background-agent-supervisor.js");
+          const { listBackgroundAgents } = await import(
+            "../lib/background-agent-supervisor.js"
+          );
           background = listBackgroundAgents({ all: true });
         } catch (error) {
           sourceErrors.background = error?.message || String(error);
         }
         try {
-          const { readRemoteControlStates } =
-            await import("../lib/remote-control.js");
+          const { readRemoteControlStates } = await import(
+            "../lib/remote-control.js"
+          );
           remote = readRemoteControlStates();
         } catch (error) {
           sourceErrors.remote = error?.message || String(error);
         }
         try {
-          const { listCollaborationRuns } =
-            await import("../lib/collaboration-run-store.js");
+          const { listCollaborationRuns } = await import(
+            "../lib/collaboration-run-store.js"
+          );
           team = listCollaborationRuns({ limit }).filter(
             (run) => run?.kind === "team",
           );
@@ -392,8 +396,9 @@ export function registerSessionCommand(program, dependencies = {}) {
           sourceErrors.workflow = error?.message || String(error);
         }
         try {
-          const { listDynamicWorkflowWorkbenchStates } =
-            await import("../lib/dynamic-workflow-runtime.js");
+          const { listDynamicWorkflowWorkbenchStates } = await import(
+            "../lib/dynamic-workflow-runtime.js"
+          );
           const discovered = listDynamicWorkflowWorkbenchStates(projectRoot, {
             limit,
           });
@@ -412,8 +417,9 @@ export function registerSessionCommand(program, dependencies = {}) {
           // engine proves that the exact worktree is supported. Copy-mode
           // checkpoints need explicit paths and therefore cannot truthfully be
           // offered as a one-click session action.
-          const { isCheckpointAvailable } =
-            await import("../lib/checkpoint-store.js");
+          const { isCheckpointAvailable } = await import(
+            "../lib/checkpoint-store.js"
+          );
           const capability = new Map();
           const decorate = (items, pathFor, sessionFor) =>
             items.map((item) => {
@@ -456,8 +462,9 @@ export function registerSessionCommand(program, dependencies = {}) {
           // checkpoint action unavailable with its explicit reason.
         }
         try {
-          const { ArtifactStore, publicArtifactMetadata } =
-            await import("../lib/artifact-store.js");
+          const { ArtifactStore, publicArtifactMetadata } = await import(
+            "../lib/artifact-store.js"
+          );
           artifacts = new ArtifactStore().list().map(publicArtifactMetadata);
         } catch {
           // Summaries are optional; absence never removes a session.
@@ -469,22 +476,25 @@ export function registerSessionCommand(program, dependencies = {}) {
           // Summaries are optional; absence never removes a session.
         }
         try {
-          const { SessionMessageFabric } =
-            await import("../lib/session-message-fabric.js");
+          const { SessionMessageFabric } = await import(
+            "../lib/session-message-fabric.js"
+          );
           sessionMessageFabric = new SessionMessageFabric().projection();
         } catch (error) {
           sourceErrors.sessionMessageFabric = error?.message || String(error);
         }
         try {
-          const { SessionWorkbenchStore } =
-            await import("../lib/session-workbench-store.js");
+          const { SessionWorkbenchStore } = await import(
+            "../lib/session-workbench-store.js"
+          );
           sessionWorkbench = new SessionWorkbenchStore().projection();
         } catch (error) {
           sourceErrors.sessionWorkbench = error?.message || String(error);
         }
 
-        const { buildSessionProjection } =
-          await import("../lib/session-projection.js");
+        const { buildSessionProjection } = await import(
+          "../lib/session-projection.js"
+        );
         const projection = buildSessionProjection({
           local,
           background,
@@ -511,8 +521,9 @@ export function registerSessionCommand(program, dependencies = {}) {
           }
         }
       } catch (error) {
-        const { disconnectedSessionProjection } =
-          await import("../lib/session-projection.js");
+        const { disconnectedSessionProjection } = await import(
+          "../lib/session-projection.js"
+        );
         if (options.json) {
           jsonPayload = JSON.stringify(
             disconnectedSessionProjection(error?.message || String(error)),
@@ -562,8 +573,9 @@ export function registerSessionCommand(program, dependencies = {}) {
         } else {
           // Live path: resolve the session's linked PR and fetch via gh.
           const { getPrLinks } = await import("../lib/pr-link-ledger.js");
-          const { getLastSessionId } =
-            await import("../harness/jsonl-session-store.js");
+          const { getLastSessionId } = await import(
+            "../harness/jsonl-session-store.js"
+          );
           const sid = !id || id === "last" ? getLastSessionId() : id;
           const links = sid ? getPrLinks(sid) : [];
           if (links.length === 0) {
@@ -641,8 +653,9 @@ export function registerSessionCommand(program, dependencies = {}) {
         // (single / non-TTY / Ctrl-C). Same helper as `cc agent --resume`.
         if (!id) {
           ctx = await bootstrap({ verbose: program.opts().verbose });
-          const { pickRecentSession } =
-            await import("../lib/session-picker.js");
+          const { pickRecentSession } = await import(
+            "../lib/session-picker.js"
+          );
           const picked = await pickRecentSession(ctx);
           if (!picked.id) {
             logger.error(
@@ -672,8 +685,9 @@ export function registerSessionCommand(program, dependencies = {}) {
         if (jsonlId) {
           // Tamper gate: a broken hash chain means the transcript was edited
           // outside the store — never silently rebuild it as trusted context.
-          const { verifySession } =
-            await import("../harness/jsonl-session-store.js");
+          const { verifySession } = await import(
+            "../harness/jsonl-session-store.js"
+          );
           const trust = verifySession(jsonlId);
           if (["missing", "conflict"].includes(trust.status)) {
             logger.error(
@@ -741,12 +755,15 @@ export function registerSessionCommand(program, dependencies = {}) {
           resolveChatCommandEvolutionComposition,
           assertChatSessionUsageAdmission,
         } = await import("./chat.js");
-        const { readEvolutionCompositionFactory } =
-          await import("../lib/evolution/governed-model-turn.js");
-        const { loadEvolutionDeploymentCommandDependencies } =
-          await import("../lib/evolution/evolution-deployment-loader.js");
-        const { waitForAgentEvolutionSession } =
-          await import("../lib/evolution/agent-evolution-session-lifecycle.js");
+        const { readEvolutionCompositionFactory } = await import(
+          "../lib/evolution/governed-model-turn.js"
+        );
+        const { loadEvolutionDeploymentCommandDependencies } = await import(
+          "../lib/evolution/evolution-deployment-loader.js"
+        );
+        const { waitForAgentEvolutionSession } = await import(
+          "../lib/evolution/agent-evolution-session-lifecycle.js"
+        );
         assertChatSessionUsageAdmission(sess.id);
         // Resume is a chat entrypoint. Use the target's authenticated chat
         // deployment, loaded only here so read-only session commands need none.
@@ -757,8 +774,8 @@ export function registerSessionCommand(program, dependencies = {}) {
           );
         const composition =
           await resolveChatCommandEvolutionComposition(factory);
-        const ingress = composition.evolutionIngress;
-        await ingress.start();
+        const ingress = composition?.evolutionIngress ?? null;
+        if (ingress !== null) await ingress.start();
         const lifecycle = await startChatRepl({
           model: options.model || sess.model,
           provider: options.provider || sess.provider || "ollama",
@@ -767,7 +784,9 @@ export function registerSessionCommand(program, dependencies = {}) {
           sessionId: sess.id,
           evolutionIngress: ingress,
         });
-        await waitForAgentEvolutionSession(lifecycle, ingress);
+        if (ingress !== null)
+          await waitForAgentEvolutionSession(lifecycle, ingress);
+        else await lifecycle.finished;
       } catch (err) {
         logger.error(`Failed: ${err.message}`);
         process.exitCode = 1;
@@ -810,8 +829,9 @@ export function registerSessionCommand(program, dependencies = {}) {
           );
         }
         if (sid) {
-          const { renderAgentSessionMarkdown } =
-            await import("../lib/agent-session-export.js");
+          const { renderAgentSessionMarkdown } = await import(
+            "../lib/agent-session-export.js"
+          );
           markdown = renderAgentSessionMarkdown(sid, store.readEvents(sid), {
             exportedAt: new Date().toISOString(),
           });
@@ -1064,8 +1084,9 @@ export function registerSessionCommand(program, dependencies = {}) {
         }
         let result;
         if (jsonlId) {
-          const { renameSession } =
-            await import("../harness/jsonl-session-store.js");
+          const { renameSession } = await import(
+            "../harness/jsonl-session-store.js"
+          );
           result = renameSession(jsonlId, normalized);
         } else {
           ctx = await bootstrap({ verbose: program.opts().verbose });
@@ -1104,8 +1125,9 @@ export function registerSessionCommand(program, dependencies = {}) {
     .option("--json", "Output as JSON")
     .action(async (options) => {
       try {
-        const { pruneJsonlSessions } =
-          await import("../harness/jsonl-session-store.js");
+        const { pruneJsonlSessions } = await import(
+          "../harness/jsonl-session-store.js"
+        );
         const result = pruneJsonlSessions({
           olderThanDays: Number(options.olderThan),
           keep: options.keep != null ? Number(options.keep) : undefined,
@@ -1483,8 +1505,9 @@ export function registerSessionCommand(program, dependencies = {}) {
     .option("--json", "Output as JSON")
     .action(async (id, options) => {
       try {
-        const { getApprovalGate } =
-          await import("../lib/session-core-singletons.js");
+        const { getApprovalGate } = await import(
+          "../lib/session-core-singletons.js"
+        );
         const gate = await getApprovalGate();
         if (options.set) {
           await gate.setSessionPolicy(id, options.set);
@@ -1519,8 +1542,9 @@ export function registerSessionCommand(program, dependencies = {}) {
     .option("--json", "Output as JSON")
     .action(async (options) => {
       try {
-        const { getSessionManager } =
-          await import("../lib/session-core-singletons.js");
+        const { getSessionManager } = await import(
+          "../lib/session-core-singletons.js"
+        );
         const mgr = getSessionManager();
         const live = mgr.list({
           agentId: options.agent,
@@ -1564,8 +1588,9 @@ export function registerSessionCommand(program, dependencies = {}) {
     .argument("<id>", "Session ID")
     .action(async (id) => {
       try {
-        const { getSessionManager } =
-          await import("../lib/session-core-singletons.js");
+        const { getSessionManager } = await import(
+          "../lib/session-core-singletons.js"
+        );
         const mgr = getSessionManager();
         if (!mgr.has(id)) {
           logger.error(`Session ${id} is not active in this process`);
@@ -1590,8 +1615,9 @@ export function registerSessionCommand(program, dependencies = {}) {
     .argument("<id>", "Session ID")
     .action(async (id) => {
       try {
-        const { getSessionManager } =
-          await import("../lib/session-core-singletons.js");
+        const { getSessionManager } = await import(
+          "../lib/session-core-singletons.js"
+        );
         const mgr = getSessionManager();
         const ok = await mgr.resume(id);
         if (!ok) {
@@ -1620,12 +1646,14 @@ export function registerSessionCommand(program, dependencies = {}) {
     .option("--agent-id <id>", "Agent id for scope=agent")
     .action(async (id, options) => {
       try {
-        const { getSessionManager } =
-          await import("../lib/session-core-singletons.js");
+        const { getSessionManager } = await import(
+          "../lib/session-core-singletons.js"
+        );
         if (options.consolidate) {
           try {
-            const { consolidateJsonlSession } =
-              await import("../lib/session-consolidator.js");
+            const { consolidateJsonlSession } = await import(
+              "../lib/session-consolidator.js"
+            );
             const res = await consolidateJsonlSession(id, {
               scope: options.scope,
               scopeId: options.scopeId || null,
@@ -1844,8 +1872,9 @@ export function registerSessionCommand(program, dependencies = {}) {
           );
           process.exit(1);
         }
-        const { sessionUsage, allSessionsUsage } =
-          await import("../lib/session-usage.js");
+        const { sessionUsage, allSessionsUsage } = await import(
+          "../lib/session-usage.js"
+        );
         const result = id
           ? sessionUsage(id)
           : allSessionsUsage({ limit: parseInt(options.limit, 10) || 1000 });
@@ -1918,8 +1947,9 @@ export function registerSessionCommand(program, dependencies = {}) {
     .option("--json", "Machine-readable JSON output")
     .action(async (id) => {
       try {
-        const { getVerifiedSessionObservabilityAuthority } =
-          await import("../harness/jsonl-session-store.js");
+        const { getVerifiedSessionObservabilityAuthority } = await import(
+          "../harness/jsonl-session-store.js"
+        );
         const authority = getVerifiedSessionObservabilityAuthority(id);
         console.log(
           JSON.stringify(
@@ -2357,8 +2387,9 @@ async function mirrorPruneSessions() {
  * (`session.mirror.encryption`). Requires both to be configured.
  */
 async function mirrorRotateKey() {
-  const { createMirror, createMirrorCipher, rotateMirrorKey } =
-    await import("../harness/session-mirror.js");
+  const { createMirror, createMirrorCipher, rotateMirrorKey } = await import(
+    "../harness/session-mirror.js"
+  );
   const { cfg } = await loadConfiguredMirror();
   if (!cfg || !cfg.kind || cfg.kind === "none") {
     return { target: null };

package/src/commands/ui.js

@@ -1,6 +1,10 @@
 import { logger } from "../lib/logger.js";
 import { createAgentRuntimeFactory } from "../runtime/runtime-factory.js";
 import { readEvolutionCompositionFactory } from "../lib/evolution/governed-model-turn.js";
+import {
+  prepareConfiguredUiModelTurn,
+  loadConfiguredUiEvolutionFactory,
+} from "../lib/evolution/optional-ui-model-turn.js";
 import { loadEvolutionDeploymentCommandDependencies } from "../lib/evolution/evolution-deployment-loader.js";
 import { getEvolutionDeploymentStatus } from "../lib/evolution/evolution-deployment-config.js";
 
@@ -36,7 +40,7 @@ export function registerUiCommand(program, dependencies = {}) {
           try {
             deploymentDependencies =
               await loadEvolutionDeploymentCommandDependencies("ui", {
-                initializeDefaultLocalUi: true,
+                initializeDefaultLocalUi: false,
               });
           } catch (error) {
             localTrustSetupError = error;
@@ -44,7 +48,10 @@ export function registerUiCommand(program, dependencies = {}) {
           activeEvolutionCompositionFactory = readEvolutionCompositionFactory(
             deploymentDependencies || {},
           );
-          if (activeEvolutionCompositionFactory === null) {
+          if (
+            activeEvolutionCompositionFactory === null &&
+            localTrustSetupError
+          ) {
             const status = await getEvolutionDeploymentStatus();
             const readiness = status.readiness.ui;
             logger.warn(
@@ -71,13 +78,19 @@ export function registerUiCommand(program, dependencies = {}) {
           10,
         );
         const runtime = createAgentRuntimeFactory({
-          deps:
-            activeEvolutionCompositionFactory === null
+          deps: {
+            ...(activeEvolutionCompositionFactory === null
               ? {}
               : {
                   evolutionCompositionFactory:
                     activeEvolutionCompositionFactory,
-                },
+                }),
+            // Re-read the shared setting at each new Quick Ask request so the
+            // GUI and config-file switches also work in an already running UI.
+            prepareUiModelTurn: prepareConfiguredUiModelTurn,
+            resolveEvolutionCompositionFactory:
+              loadConfiguredUiEvolutionFactory,
+          },
         }).createUiRuntime({
           port,
           wsPort: parseInt(opts.wsPort, 10),

package/src/constants.js

@@ -136,6 +136,9 @@ export const DEFAULT_CONFIG = {
   completedAt: null,
   edition: "personal",
   features: {},
+  evolution: {
+    enabled: false,
+  },
   paths: {
     projectRoot: null,
     database: null,

package/src/data/changelog.json

@@ -1,6 +1,32 @@
 {
   "source": "CHANGELOG.md",
   "releases": [
+    {
+      "productVersion": null,
+      "cliVersion": "0.166.127",
+      "cliVersions": ["0.166.127"],
+      "date": "2026-10-27",
+      "title": "",
+      "sections": [
+        {
+          "heading": "Added - cc CLI 0.166.127: optional self-evolution controls (2026-10-27)",
+          "body": "- Default fresh installations and older automatically generated local deployments to self-evolution off. Share the boolean `evolution.enabled` setting across CLI, cc ui, VS Code and JetBrains; explicit false overrides inherited deployment environment variables, while absent settings preserve manually selected deployments.\n- Enable and disable through configuration or deployment commands, initialize the local signed runtime on explicit enable, and retain deployment and trust history when disabled. Require a restart for running Agent sessions and reread the setting for new UI model requests.\n- Keep ordinary Agent, ask, chat, session resume and UI intent confirmation available while off. Retain strict signature and evidence checks for enabled deployments and prevent unrelated configuration writes from changing an absent Evolution choice.\n- Add shared configuration documentation and regression coverage. Pair IDE candidates VS Code 0.37.164 and JetBrains 0.4.180 with CLI 0.166.127; publish them only after verified public CLI availability. Child dependency pins are unchanged.\n- Require exact-source Linux, Windows and macOS CLI CI and Strict Sandbox before GitHub Actions OIDC publication and public package readback. Automatic candidate promotion remains HOLD; this switch does not start a full RRSI campaign or claim new live model-task acceptance."
+        }
+      ]
+    },
+    {
+      "productVersion": null,
+      "cliVersion": "0.166.126",
+      "cliVersions": ["0.166.126"],
+      "date": "2026-10-26",
+      "title": "",
+      "sections": [
+        {
+          "heading": "Fixed - cc CLI 0.166.126: retained recovery context JSON boundaries (2026-10-26)",
+          "body": "- Prevent host-created file excerpts, task checkpoints, remote-read summaries and worklog context from injecting truncated JSON into the next model request. Reduce complete JSON structurally and explicitly omit excerpts that cannot be safely represented within the existing decoding budgets.\n- Project legacy checkpoints and regenerated WORKLOG.md views without rewriting canonical session history. Omitted file excerpts retain their location and version but do not count as visible source for subsequent reads.\n- Preserve strict validation of original tool evidence, credential/PII redaction and historical projection rules. Add continuation, restart, handoff, Unicode, budget and real projection verification regressions.\n- Keep all child dependency pins and the public Open VSX 0.37.162 / JetBrains 0.4.179 pairing unchanged. Require exact-source Linux, Windows and macOS CLI CI and CLI Strict Sandbox, publish through GitHub Actions OIDC, verify public archive bytes and provenance, then merge the release PR."
+        }
+      ]
+    },
     {
       "productVersion": null,
       "cliVersion": "0.166.125",

package/src/gateways/ws/action-protocol.js

@@ -1,3 +1,5 @@
+import { resolveServerEvolutionFactory } from "../../lib/evolution/optional-ui-model-turn.js";
+
 // Track running cowork tasks for cancellation
 const _runningTasks = new Map();
 
@@ -54,7 +56,7 @@ export async function handleCoworkTask(server, id, ws, message) {
       files,
       cwd: server.projectRoot || process.cwd(),
       llmOptions: {},
-      evolutionCompositionFactory: server.evolutionCompositionFactory ?? null,
+      evolutionCompositionFactory: await resolveServerEvolutionFactory(server),
       signal: ac.signal,
       ...(message.mcpSessionId ? { mcpSessionId: message.mcpSessionId } : {}),
       ...(useParallel
@@ -205,8 +207,9 @@ export async function handleCoworkHistory(server, id, ws, message) {
 
 export async function handleCoworkTemplates(server, id, ws) {
   try {
-    const { getTemplatesForUI } =
-      await import("../../lib/cowork-task-templates.js");
+    const { getTemplatesForUI } = await import(
+      "../../lib/cowork-task-templates.js"
+    );
     const templates = getTemplatesForUI();
     server._send(ws, { id, type: "cowork:templates", templates });
   } catch (err) {
@@ -240,15 +243,16 @@ export async function handleOrchestrate(server, id, ws, message) {
   }
 
   try {
-    const { Orchestrator, TASK_SOURCE } =
-      await import("../../lib/orchestrator.js");
+    const { Orchestrator, TASK_SOURCE } = await import(
+      "../../lib/orchestrator.js"
+    );
 
     const orch = new Orchestrator({
       cwd: cwd || server.projectRoot || process.cwd(),
       maxParallel: Math.min(parseInt(agents, 10) || 3, 10),
       ciCommand: ci,
       agents: strategy ? { strategy } : undefined,
-      evolutionCompositionFactory: server.evolutionCompositionFactory ?? null,
+      evolutionCompositionFactory: await resolveServerEvolutionFactory(server),
       verbose: false,
     });
 
@@ -389,8 +393,9 @@ async function _resolveWorkflowExecutionAuthority(server, sessionId) {
     }
     provider = descriptor.value;
   } else {
-    ({ getVerifiedSessionExecutionLocationAuthority: provider } =
-      await import("../../harness/jsonl-session-store.js"));
+    ({ getVerifiedSessionExecutionLocationAuthority: provider } = await import(
+      "../../harness/jsonl-session-store.js"
+    ));
   }
   if (typeof provider !== "function") {
     const error = new Error(
@@ -507,8 +512,9 @@ export async function handleWorkflowSave(server, id, ws, message) {
     );
   }
   try {
-    const { getWorkflowRecord, validateWorkflow, saveWorkflow } =
-      await import("../../lib/cowork-workflow.js");
+    const { getWorkflowRecord, validateWorkflow, saveWorkflow } = await import(
+      "../../lib/cowork-workflow.js"
+    );
     const result = validateWorkflow(workflow);
     if (!result.valid) {
       return _sendError(
@@ -595,8 +601,9 @@ export async function handleWorkflowRun(server, id, ws, message) {
   try {
     const { getWorkflowRecord, getWorkflowVersion, executeWorkflow } =
       await import("../../lib/cowork-workflow.js");
-    const { executeDynamicWorkflowWithAdmission } =
-      await import("../../lib/dynamic-workflow-facade.js");
+    const { executeDynamicWorkflowWithAdmission } = await import(
+      "../../lib/dynamic-workflow-facade.js"
+    );
     let workflowRunTask;
     if (Object.hasOwn(server, "workflowRunTask")) {
       const descriptor = Object.getOwnPropertyDescriptor(
@@ -608,8 +615,9 @@ export async function handleWorkflowRun(server, id, ws, message) {
       }
       workflowRunTask = descriptor.value;
     } else {
-      ({ runCoworkTask: workflowRunTask } =
-        await import("../../lib/cowork-task-runner.js"));
+      ({ runCoworkTask: workflowRunTask } = await import(
+        "../../lib/cowork-task-runner.js"
+      ));
     }
     if (typeof workflowRunTask !== "function") {
       throw new Error("Workflow task runner is unavailable");

package/src/gateways/ws/chat-intent-protocol.js

@@ -17,6 +17,7 @@ import {
   classifyFollowupIntent,
 } from "../../lib/chat-intent-service.js";
 import { resolveLlmCreds } from "./llm-creds.js";
+import { resolveServerEvolutionFactory } from "../../lib/evolution/optional-ui-model-turn.js";
 
 /**
  * Look up LLM creds for the intent flow.
@@ -60,7 +61,8 @@ export async function handleChatIntentUnderstand(server, id, ws, message) {
       contextMode: message.contextMode || "global",
       history,
       llmOptions,
-      evolutionCompositionFactory: server.evolutionCompositionFactory ?? null,
+      evolutionCompositionFactory: await resolveServerEvolutionFactory(server),
+      prepareModelTurn: server.prepareUiModelTurn,
     });
     server._send(ws, {
       id,
@@ -118,7 +120,8 @@ export async function handleChatIntentUnderstandStream(
       contextMode: message.contextMode || "global",
       history,
       llmOptions,
-      evolutionCompositionFactory: server.evolutionCompositionFactory ?? null,
+      evolutionCompositionFactory: await resolveServerEvolutionFactory(server),
+      prepareModelTurn: server.prepareUiModelTurn,
     })) {
       if (event.type === "token") {
         server._send(ws, {
@@ -171,7 +174,8 @@ export async function handleChatIntentClassifyFollowup(
       input,
       context: message.context || {},
       llmOptions,
-      evolutionCompositionFactory: server.evolutionCompositionFactory ?? null,
+      evolutionCompositionFactory: await resolveServerEvolutionFactory(server),
+      prepareModelTurn: server.prepareUiModelTurn,
     });
     server._send(ws, {
       id,

package/src/gateways/ws/llm-chat-protocol.js

@@ -180,7 +180,14 @@ export async function handleLlmChat(server, id, ws, message) {
   ws?.once?.("close", disconnect);
   try {
     const turn = await waitForChatPhase(
-      prepareGovernedModelTurn(server.evolutionCompositionFactory ?? null, {
+      (
+        server.prepareUiModelTurn ||
+        ((context) =>
+          prepareGovernedModelTurn(
+            server.evolutionCompositionFactory ?? null,
+            context,
+          ))
+      )({
         mode: "ws-llm-chat",
         messages: message.messages,
         signal: controller.signal,
@@ -189,7 +196,7 @@ export async function handleLlmChat(server, id, ws, message) {
       "initialization",
     );
     const streamOptions = {
-      requireCompletion: turn.governed,
+      requireCompletion: true,
       signal: controller.signal,
     };
     // Tell the browser the configured deadline even when waiting hints are

package/src/gateways/ws/ws-server.js

@@ -124,10 +124,7 @@ import {
 } from "./artifact-protocol.js";
 import { executionBroker } from "../../lib/process-execution-broker/index.js";
 import { collectWorkspacePluginBinSandboxPolicy } from "../../lib/plugin-runtime/bin.js";
-import {
-  loadConfig,
-  loadUserConfig,
-} from "../../lib/config-manager.js";
+import { loadConfig, loadUserConfig } from "../../lib/config-manager.js";
 
 export const _deps = {
   spawn: (...args) => executionBroker.spawn(...args),
@@ -200,11 +197,9 @@ function boundedInteger(value, fallback, maximum = Number.MAX_SAFE_INTEGER) {
 }
 
 function loadCurrentLlmConfig() {
-  const savedLlm =
-    loadUserConfig({ failIfUnavailable: true }).llm || {};
+  const savedLlm = loadUserConfig({ failIfUnavailable: true }).llm || {};
   const resolvedLlm = loadConfig({ failIfUnavailable: true }).llm || {};
-  const confirmedLlm =
-    loadUserConfig({ failIfUnavailable: true }).llm || {};
+  const confirmedLlm = loadUserConfig({ failIfUnavailable: true }).llm || {};
   const provider =
     typeof savedLlm.provider === "string" && savedLlm.provider.trim()
       ? savedLlm.provider.trim()
@@ -378,6 +373,21 @@ export class ChainlessChainWSServer extends EventEmitter {
     }
     this.evolutionCompositionFactory =
       options.evolutionCompositionFactory || null;
+    if (
+      options.prepareUiModelTurn != null &&
+      typeof options.prepareUiModelTurn !== "function"
+    )
+      throw new TypeError("prepareUiModelTurn must be a function");
+    this.prepareUiModelTurn = options.prepareUiModelTurn || null;
+    if (
+      options.resolveEvolutionCompositionFactory != null &&
+      typeof options.resolveEvolutionCompositionFactory !== "function"
+    )
+      throw new TypeError(
+        "resolveEvolutionCompositionFactory must be a function",
+      );
+    this.resolveEvolutionCompositionFactory =
+      options.resolveEvolutionCompositionFactory || null;
     this.runtimeAdmissionDependencies =
       captureSkillRuntimeDependencies(options);
     this.skillOutcomeIndex =
@@ -827,8 +837,9 @@ export class ChainlessChainWSServer extends EventEmitter {
   /** Read the same static + scoped authority used by the Agent Core. */
   async _handlePermissionRulesGet(id, ws) {
     try {
-      const { loadPermissionAuthority } =
-        await import("../../lib/permission-authority.js");
+      const { loadPermissionAuthority } = await import(
+        "../../lib/permission-authority.js"
+      );
       const loaded = loadPermissionAuthority({ cwd: this.projectRoot });
       this._send(ws, {
         id,
@@ -1588,8 +1599,9 @@ export class ChainlessChainWSServer extends EventEmitter {
   /** @private — ping/pong heartbeat to detect dead connections */
   async _ensureTaskManager() {
     if (this._taskManager) return this._taskManager;
-    const { BackgroundTaskManager } =
-      await import("../../harness/background-task-manager.js");
+    const { BackgroundTaskManager } = await import(
+      "../../harness/background-task-manager.js"
+    );
     this._taskManager = new BackgroundTaskManager({
       recoverOnStart: true,
       policyCwd: this.projectRoot,