amicus 4.2.0 → 4.2.1

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "amicus",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Multi-model LLM Council + parallel AI window for Claude Code. Run structured council reviews across Gemini, GPT, DeepSeek and more — or fork a conversation to any model and fold the results back.",
   "author": {
     "name": "Christian Wagner"

package/CHANGELOG.md

@@ -5,6 +5,29 @@ All notable changes to Amicus are documented here. Format follows
 
 ## [Unreleased]
 
+## [4.2.1] - 2026-07-23
+
+### Security
+
+- **`.env` key writes strip CR/LF and re-assert `0600`.** A provider key or local-provider
+  bearer that carries a stray newline — a trailing `\r\n` from a paste, or an embedded one — is
+  now sanitized before it is persisted, so it can no longer split `~/.config/amicus/.env` into a
+  broken line or silently truncate the stored token; the sanitized value is also what lands in
+  the process environment. Every rewrite of the secrets file additionally re-asserts `0600`
+  permissions, re-tightening an existing `.env` whose mode had drifted (created under a loose
+  umask, or hand-edited). POSIX; a no-op on Windows/NTFS, where key-file ACL hardening remains a
+  separate tracked item.
+
+### Fixed
+
+- Test-suite hardening: a global hermetic baseline pins the config and keys directories to a
+  per-worker scratch dir so no unit test can read or write the real `~/.config/amicus`. Scoped to
+  the unit run; the integration rails continue to manage their own credentials. This closes the
+  config/keys-dir door only — the OpenCode `auth.json` door is handled separately by the keyless
+  integration rail.
+- Removed a redundant `.env` re-read in the credential loader, and cleaned up test scratch
+  directories that were leaking across runs.
+
 ## [4.2.0] - 2026-07-23
 
 ### Added

package/README.md

@@ -15,7 +15,7 @@ Hand Claude a plan, a design, a diff, an architecture decision, a manuscript —
 [![Node.js](https://img.shields.io/badge/node-%3E%3D18-brightgreen?labelColor=1A1C29)](https://nodejs.org)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?labelColor=1A1C29)](./CONTRIBUTING.md)
 
-> **Supported clients:** Claude Code CLI and Claude Cowork are fully tested and supported. Claude Code web and Claude Desktop are experimental.
+> **Supported clients:** Claude Code CLI, Claude Desktop, and Claude Cowork are fully tested and supported. Claude Code web is experimental.
 
 </div>
 
@@ -348,7 +348,7 @@ $ amicus status demo123 --json
   "taskId": "demo123",
   "status": "complete",
   "elapsed": "5m 0s",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "model": "google/gemini-2.5-flash",
   "phase": "terminal"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amicus",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "mcpName": "io.github.BourbonDog/amicus",
   "description": "Multi-model LLM Council + parallel AI window for Claude Code. Run structured council reviews across Gemini, GPT, DeepSeek and more — or fork a conversation to any model and fold the results back.",
   "keywords": [

package/src/utils/api-key-store.js

@@ -60,6 +60,8 @@ function migrateEnvFileKey(envPath, oldName, newName) {
     const updated = content.replace(re, `${newName}=`);
     if (updated !== content) {
       fs.writeFileSync(envPath, updated, { mode: 0o600 });
+      // Re-assert 0600 on the existing secrets file (writeFileSync mode is create-only).
+      try { fs.chmodSync(envPath, 0o600); } catch (_err) { /* perms best-effort */ }
     }
   } catch (_err) {
     // Best effort
@@ -149,10 +151,11 @@ function saveApiKey(provider, key) {
   if (!envVar) {
     return { success: false, error: `Unknown provider: ${provider}` };
   }
-  // Shared merge helper (preserves comments/other lines, dedups, 0600, trailing NL).
-  upsertEnvLine(getEnvPath(), envVar, key);
-  // Also set process.env so the key is immediately available
-  process.env[envVar] = key;
+  // Shared merge helper (preserves comments/other lines, dedups, 0600, trailing NL;
+  // strips CR/LF and returns the cleaned value).
+  const clean = upsertEnvLine(getEnvPath(), envVar, key);
+  // Also set process.env so the key is immediately available (sanitized to match disk)
+  process.env[envVar] = clean;
   return { success: true };
 }
 

package/src/utils/env-loader.js

@@ -53,7 +53,6 @@ function loadCredentials() {
   // process.env (same never-overwrite rule) so the engine's {env:VAR} finds it.
   try {
     const { getLocalProviders } = require('./local-providers');
-    const fileEntries = loadEnvEntries();
     for (const entry of Object.values(getLocalProviders())) {
       if (entry.apiKeyEnv && !process.env[entry.apiKeyEnv]) {
         const v = fileEntries.get(entry.apiKeyEnv);

package/src/utils/env-raw-store.js

@@ -23,6 +23,10 @@ const ENV_VAR_RE = /^[A-Z][A-Z0-9_]*$/;
  * @param {string} value
  */
 function upsertEnvLine(envPath, envVar, value) {
+  // Strip CR/LF: a newline in the value corrupts the line-based .env (splits it,
+  // or bakes a trailing CR into the persisted/served token). Bearer/API-key schemes
+  // never contain newlines, so stripping cannot damage a legitimate token.
+  const clean = String(value).replace(/[\r\n]/g, '');
   fs.mkdirSync(path.dirname(envPath), { recursive: true });
 
   let lines = [];
@@ -37,7 +41,7 @@ function upsertEnvLine(envPath, envVar, value) {
   let found = false;
   for (let i = 0; i < lines.length; i++) {
     if (lines[i].trim().startsWith(envVar + '=')) {
-      lines[i] = `${envVar}=${value}`;
+      lines[i] = `${envVar}=${clean}`;
       found = true;
       break;
     }
@@ -46,10 +50,14 @@ function upsertEnvLine(envPath, envVar, value) {
     while (lines.length > 0 && lines[lines.length - 1].trim() === '') {
       lines.pop();
     }
-    lines.push(`${envVar}=${value}`);
+    lines.push(`${envVar}=${clean}`);
   }
 
   fs.writeFileSync(envPath, lines.join('\n') + '\n', { mode: 0o600 });
+  // writeFileSync's mode only applies on CREATE; re-assert 0600 so an existing
+  // secrets file whose perms drifted is re-tightened. Best-effort (no-op on Windows).
+  try { fs.chmodSync(envPath, 0o600); } catch (_err) { /* perms best-effort */ }
+  return clean;
 }
 
 /**
@@ -68,6 +76,7 @@ function deleteEnvLine(envPath, envVar) {
         lines.pop();
       }
       fs.writeFileSync(envPath, lines.length > 0 ? lines.join('\n') + '\n' : '', { mode: 0o600 });
+      try { fs.chmodSync(envPath, 0o600); } catch (_err) { /* perms best-effort */ }
     }
   } catch (_err) {
     // Best-effort
@@ -89,8 +98,8 @@ function saveRawEnv(envVar, value) {
     return { success: false, error: `Invalid env var name: ${envVar}` };
   }
   const { getEnvPath } = require('./api-key-store'); // lazy: avoids a load-time cycle
-  upsertEnvLine(getEnvPath(), envVar, value);
-  process.env[envVar] = value;
+  const clean = upsertEnvLine(getEnvPath(), envVar, value);
+  process.env[envVar] = clean; // mirror the sanitized on-disk value
   return { success: true };
 }