chainlesschain 0.166.132 → 0.166.133

package/src/lib/ws-chat-handler.js

@@ -14,7 +14,12 @@ export class WSChatHandler {
    * @param {import("./ws-session-manager.js").Session} options.session
    * @param {import("./interaction-adapter.js").WebSocketInteractionAdapter} options.interaction
    */
-  constructor({ session, interaction, evolutionCompositionFactory = null }) {
+  constructor({
+    session,
+    interaction,
+    evolutionCompositionFactory = null,
+    prepareUiModelTurn = null,
+  }) {
     if (
       evolutionCompositionFactory !== null &&
       typeof evolutionCompositionFactory !== "function"
@@ -22,6 +27,9 @@ export class WSChatHandler {
       throw new TypeError("evolutionCompositionFactory must be a function");
     }
     this._evolutionCompositionFactory = evolutionCompositionFactory;
+    if (prepareUiModelTurn !== null && typeof prepareUiModelTurn !== "function")
+      throw new TypeError("prepareUiModelTurn must be a function");
+    this._prepareUiModelTurn = prepareUiModelTurn;
     this.session = session;
     this.interaction = interaction;
     this._processing = false;
@@ -64,17 +72,22 @@ export class WSChatHandler {
       });
       runRecorded = true;
 
-      const turn = await prepareGovernedModelTurn(
-        this._evolutionCompositionFactory,
-        {
-          mode: "ws-chat-session",
-          messages: session.messages,
-        },
-      );
+      const turn = await (
+        this._prepareUiModelTurn ||
+        ((context) =>
+          prepareGovernedModelTurn(this._evolutionCompositionFactory, context))
+      )({
+        mode: "ws-chat-session",
+        messages: session.messages,
+      });
       const options = {
         provider: session.provider,
         model: session.model,
-        baseUrl: session.baseUrl || "http://localhost:11434",
+        baseUrl:
+          session.baseUrl ||
+          (session.provider === "ollama"
+            ? "http://localhost:11434"
+            : undefined),
         apiKey: session.apiKey,
         // Phase J — pipe WS session id so chat-core records token_usage
         // into the JSONL session store; visible via `cc session usage`.

package/src/runtime/agent-core.js

@@ -10,7 +10,10 @@ import {
   normalizeProviderBaseUrl,
   openAICompatibleBaseUrl,
 } from "../lib/provider-protocol.js";
-import { BUILT_IN_PROVIDERS } from "../lib/llm-providers.js";
+import {
+  BUILT_IN_PROVIDERS,
+  resolveProviderDefinition,
+} from "../lib/llm-providers.js";
 import { resolveLlmConnection } from "../lib/llm-connection-resolution.js";
 /**
  * Agent Core — transport-independent agentic logic
@@ -12122,11 +12125,65 @@ function getEffectiveToolDefinitions(options = {}) {
   });
 }
 
+function projectExactFileMutationToolSchemas(
+  definitions,
+  scope,
+  externalToolExecutors,
+) {
+  if (scope == null) return definitions;
+  return definitions.map((tool) => {
+    const name = tool?.function?.name;
+    if (
+      !["write_file", "edit_file", "edit_file_hashed"].includes(name) ||
+      !AGENT_TOOLS.includes(tool) ||
+      externalToolExecutors?.[name]
+    ) {
+      return tool;
+    }
+    const parameters = tool.function.parameters;
+    return {
+      ...tool,
+      function: {
+        ...tool.function,
+        parameters: {
+          ...parameters,
+          properties: {
+            ...parameters.properties,
+            path: {
+              ...parameters.properties.path,
+              // Complete host-authorized set: never truncate this enum or
+              // derive it from a read result. Normal tool context budgeting
+              // sees the same schema that is sent to the provider.
+              enum: [...scope.allowedPaths],
+              description:
+                "Use exactly one listed canonical repo-relative path. Read tools may return absolute paths; those are not valid mutation arguments in this run. Do not use an absolute path, ./ prefix, .. segment or backslash. This schema is guidance; all execution-time permission and file-identity checks still apply.",
+            },
+          },
+        },
+      },
+    };
+  });
+}
+
 function getProviderToolDefinitions(options = {}) {
-  return projectMcpToolDefinitions(
+  const definitions = projectMcpToolDefinitions(
     getEffectiveToolDefinitions(options),
     options.externalToolExecutors,
   );
+  if (options.fileMutationScope == null) return definitions;
+  if (options.exactToolNames !== true || options.hermeticExecution !== true) {
+    throw new Error(
+      "exact file mutation scope requires exactToolNames=true and hermeticExecution=true",
+    );
+  }
+  const scope = normalizeExactFileMutationScope(options.fileMutationScope, {
+    cwd: options.cwd || process.cwd(),
+  });
+  return projectExactFileMutationToolSchemas(
+    definitions,
+    scope,
+    options.externalToolExecutors,
+  );
 }
 
 const PROVIDER_REQUEST_ID_RE = /^[\x21-\x7e]{1,512}$/;
@@ -12540,7 +12597,7 @@ export async function chatWithTools(rawMessages, options) {
   }
 
   // OpenAI-compatible providers
-  const providerDefinition = BUILT_IN_PROVIDERS[provider];
+  const providerDefinition = resolveProviderDefinition(provider);
   const url = openAICompatibleBaseUrl(provider, baseUrl);
 
   if (!providerDefinition || !url) {
@@ -12555,7 +12612,8 @@ export async function chatWithTools(rawMessages, options) {
 
   const envKey = providerDefinition.apiKeyEnv;
   const key = apiKey;
-  if (!key) throw new Error(`${envKey} required for provider ${provider}`);
+  if (!key && provider !== "custom")
+    throw new Error(`${envKey} required for provider ${provider}`);
   const effectiveModel = model || providerDefinition.models?.[0];
   const modelProfile = resolveModelCapabilityProfile({
     provider,
@@ -12695,7 +12753,7 @@ export async function chatWithTools(rawMessages, options) {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      Authorization: `Bearer ${key}`,
+      ...(key ? { Authorization: `Bearer ${key}` } : {}),
       ...(supportsOpenAIRequestIdentity && providerRequestId
         ? { "X-Client-Request-Id": providerRequestId }
         : {}),
@@ -13315,7 +13373,7 @@ async function _chatOpenAIStreaming(
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      Authorization: `Bearer ${apiKey}`,
+      ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}),
       ...(providerRequestId
         ? { "X-Client-Request-Id": providerRequestId }
         : {}),
@@ -15018,6 +15076,7 @@ export async function* agentLoop(messages, options) {
   let effectiveToolOptions = hermeticExecution
     ? {
         ...options,
+        fileMutationScope,
         hostManagedToolPolicy: null,
         hostManagedToolPolicyAuthority: null,
         extraToolDefinitions: [],