chainlesschain 0.165.6 → 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;
+}