chainlesschain 0.165.5 → 0.165.8

package/src/lib/ide-context.js

@@ -569,10 +569,23 @@ export function normalizeDiffReviewAudit(value, binding = {}) {
  */
 export async function requestIdeDiffApproval(mcp, req = {}) {
   if (!hasIdeOpenDiff(mcp)) return null;
-  if (!req.path || typeof req.modifiedText !== "string") return null;
+  // The IDE bridge accepts a workspace path, never a Git object/blob-shaped
+  // value. Reject malformed paths before contacting the privileged bridge.
+  if (
+    typeof req.path !== "string" ||
+    req.path.trim().length === 0 ||
+    typeof req.modifiedText !== "string"
+  ) {
+    return null;
+  }
   const operation = req.operation || "modify";
   if (!DIFF_REVIEW_OPERATIONS.has(operation)) return null;
-  if (operation === "rename" && !req.targetPath) return null;
+  if (
+    operation === "rename" &&
+    (typeof req.targetPath !== "string" || req.targetPath.trim().length === 0)
+  ) {
+    return null;
+  }
   const exec = mcp.externalToolExecutors.mcp__ide__openDiff;
   const reviewContext = Object.fromEntries(
     Object.entries({

package/src/lib/llm-config-defaults.js

@@ -104,3 +104,46 @@ export function applyConfigLlmDefaults(options = {}, cfgLlm = {}, opts = {}) {
   backfillApiKey(options, cfgLlm);
   return options;
 }
+
+function optionalModel(value) {
+  if (typeof value !== "string") return null;
+  const model = value.trim();
+  return model || null;
+}
+
+/**
+ * Resolve the model precedence used by `cc agent` without allowing a default
+ * from one source to silently outrank an explicit choice from another:
+ *
+ *   CLI --model > ANTHROPIC_MODEL > settings.model > config/organization model
+ *   > ANTHROPIC_DEFAULT_MODEL (new sessions only) > runtime provider default.
+ *
+ * Environment values are supplied by the caller from the process startup
+ * environment, before settings-file `env` entries are merged. That prevents a
+ * checked-in settings file from impersonating a launcher-level override.
+ */
+export function applyAgentModelDefaults(options = {}, cfgLlm = {}, opts = {}) {
+  const explicitModel = optionalModel(opts.explicitModel);
+  const environmentModel = optionalModel(opts.anthropicModel);
+  const settingsModel = optionalModel(opts.settingsModel);
+  const defaultModel = optionalModel(opts.anthropicDefaultModel);
+
+  if (!explicitModel) {
+    if (environmentModel) {
+      options.model = environmentModel;
+    } else if (settingsModel) {
+      options.model = settingsModel;
+    }
+  }
+
+  applyConfigLlmDefaults(options, cfgLlm, {
+    // Reuse the existing config/provider wiring, but do not let its configured
+    // model overwrite one selected by a higher-priority source above.
+    explicitModel: explicitModel || environmentModel || settingsModel,
+  });
+
+  if (!options.model && opts.isNewSession !== false && defaultModel) {
+    options.model = defaultModel;
+  }
+  return options;
+}

package/src/lib/mcp-client.js

@@ -23,5 +23,7 @@ export {
   isMcpAuthenticationError,
   isMcpRpcError,
   isTransientMcpError,
+  SUPPORTED_MCP_PROTOCOL_VERSIONS,
+  assertSupportedMcpProtocolVersion,
   _deps,
 } from "../harness/mcp-client.js";

package/src/lib/mcp-headers-helper.js

@@ -17,8 +17,8 @@ const { buildExplicitHookShellInvocation } = hookShellCommand;
 export const MCP_HEADERS_HELPER_TIMEOUT_MS = 10_000;
 export const MCP_HEADERS_HELPER_MAX_OUTPUT_BYTES = 64 * 1024;
 const MAX_HELPER_COMMAND_BYTES = 32 * 1024;
-const MAX_HEADER_COUNT = 128;
-const MAX_HEADER_VALUE_BYTES = 16 * 1024;
+export const MCP_HEADERS_HELPER_MAX_HEADER_COUNT = 128;
+export const MCP_HEADERS_HELPER_MAX_HEADER_VALUE_BYTES = 16 * 1024;
 const HEADER_NAME = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
 const TRANSPORT_OWNED_HEADERS = new Set([
   "accept",
@@ -37,6 +37,25 @@ const TRANSPORT_OWNED_HEADERS = new Set([
   "upgrade",
 ]);
 const PUBLIC_CONFIG_SCOPES = new Set(["local", "project", "user", "managed"]);
+const HELPER_ENVIRONMENT_ALLOWLIST = new Set([
+  "COMSPEC",
+  "HOME",
+  "LANG",
+  "LC_ALL",
+  "LC_CTYPE",
+  "NODE_EXTRA_CA_CERTS",
+  "PATH",
+  "PATHEXT",
+  "SSL_CERT_DIR",
+  "SSL_CERT_FILE",
+  "SYSTEMROOT",
+  "TEMP",
+  "TMP",
+  "TMPDIR",
+  "USERPROFILE",
+  "WINDIR",
+  "XDG_CONFIG_HOME",
+]);
 
 function helperError(code, message) {
   const error = new Error(message);
@@ -98,6 +117,28 @@ function normalizeHelperCommand(value) {
   return value;
 }
 
+export function sanitizeMcpHeadersHelperEnvironment(environment = process.env) {
+  if (!environment || typeof environment !== "object" || isProxy(environment)) {
+    throw helperError(
+      "CC_MCP_HEADERS_HELPER_ENV_INVALID",
+      "MCP headersHelper environment must be a non-Proxy object",
+    );
+  }
+  const sanitized = {};
+  for (const key of Object.keys(environment)) {
+    if (!HELPER_ENVIRONMENT_ALLOWLIST.has(key.toUpperCase())) continue;
+    const descriptor = Object.getOwnPropertyDescriptor(environment, key);
+    if (!descriptor || !("value" in descriptor)) {
+      throw helperError(
+        "CC_MCP_HEADERS_HELPER_ENV_INVALID",
+        "MCP headersHelper environment values must be own data properties",
+      );
+    }
+    if (typeof descriptor.value === "string") sanitized[key] = descriptor.value;
+  }
+  return sanitized;
+}
+
 function canonicalHelperCwd(value, realpath = fs.realpathSync.native) {
   if (
     typeof value !== "string" ||
@@ -148,7 +189,7 @@ function normalizeHeaderMap(value, source) {
     );
   }
   const entries = Object.entries(value);
-  if (entries.length > MAX_HEADER_COUNT) {
+  if (entries.length > MCP_HEADERS_HELPER_MAX_HEADER_COUNT) {
     throw helperError(
       "CC_MCP_HEADERS_HELPER_OUTPUT_INVALID",
       `MCP ${source} headers exceed the allowed entry count`,
@@ -160,7 +201,8 @@ function normalizeHeaderMap(value, source) {
       !HEADER_NAME.test(name) ||
       typeof headerValue !== "string" ||
       hasInvalidHeaderValueCharacter(headerValue) ||
-      Buffer.byteLength(headerValue, "utf8") > MAX_HEADER_VALUE_BYTES ||
+      Buffer.byteLength(headerValue, "utf8") >
+        MCP_HEADERS_HELPER_MAX_HEADER_VALUE_BYTES ||
       (source === "dynamic" && TRANSPORT_OWNED_HEADERS.has(name.toLowerCase()))
     ) {
       throw helperError(
@@ -486,7 +528,7 @@ export function runMcpHeadersHelper(spec, deps = {}) {
     ),
   );
   const env = {
-    ...(spec?.env || process.env),
+    ...sanitizeMcpHeadersHelperEnvironment(spec?.env || process.env),
     CLAUDE_CODE_MCP_SERVER_NAME: String(spec?.serverName || ""),
     CLAUDE_CODE_MCP_SERVER_URL: String(spec?.serverUrl || ""),
     ...(spec?.pluginRoot