ofw-mcp 2.3.0 → 2.3.2

package/.claude-plugin/marketplace.json

@@ -6,7 +6,7 @@
   },
   "metadata": {
     "description": "OurFamilyWizard tools for Claude Code",
-    "version": "2.3.0"
+    "version": "2.3.2"
   },
   "plugins": [
     {
@@ -14,7 +14,7 @@
       "displayName": "OurFamilyWizard",
       "source": "./",
       "description": "OurFamilyWizard co-parenting tools for Claude — messages, calendar, expenses, and journal via MCP",
-      "version": "2.3.0",
+      "version": "2.3.2",
       "author": {
         "name": "Chris Chall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "ofw",
   "displayName": "OurFamilyWizard",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "OurFamilyWizard co-parenting tools for Claude — messages, calendar, expenses, and journal via MCP",
   "author": {
     "name": "Chris Chall"

package/dist/auth.js

@@ -45,28 +45,21 @@
 //   - `./auth-password.js` (loginWithPassword) is a separate module
 //     specifically so it can be mocked here too. This keeps the
 //     selection logic independent of either implementation.
+import { readEnvVar } from '@chrischall/mcp-utils';
 import { bootstrap } from '@fetchproxy/bootstrap';
-import { classifyBridgeError } from '@fetchproxy/server';
+import { classifyBridgeError } from '@chrischall/mcp-utils/fetchproxy';
 import { loginWithPassword } from './auth-password.js';
 import { parseBoolEnv } from './config.js';
 import pkg from '../package.json' with { type: 'json' };
 /**
  * Read an env var, trim, and treat blank / `${UNEXPANDED}` placeholders as
  * unset. Defends against MCP hosts that pass `.mcp.json` env blocks through
- * without variable expansion.
+ * without variable expansion. Delegates to @chrischall/mcp-utils' `readEnvVar`,
+ * which applies the identical sanitization (blank, `undefined`/`null`,
+ * `${...}` placeholder → unset).
  */
 function readEnv(key) {
-    const raw = process.env[key];
-    if (typeof raw !== 'string')
-        return undefined;
-    const trimmed = raw.trim();
-    if (trimmed.length === 0)
-        return undefined;
-    if (trimmed === 'undefined' || trimmed === 'null')
-        return undefined;
-    if (/^\$\{[^}]*\}$/.test(trimmed))
-        return undefined;
-    return trimmed;
+    return readEnvVar(key);
 }
 /** True if the user has explicitly disabled the fetchproxy fallback. */
 function fetchproxyDisabled() {
@@ -76,9 +69,9 @@ function fetchproxyDisabled() {
  * Resolve OFW auth using the three-path priority described at the top of
  * this file. Throws with an actionable error message when no path succeeds.
  *
- * Callers (i.e. `OFWClient.login()`) treat the return value as opaque
- * credentials — they should not branch on `source`. The field exists for
- * logging / future cache-keying only.
+ * Callers (i.e. the `OFWClient` TokenManager refresh callback) treat the
+ * return value as opaque credentials — they should not branch on `source`.
+ * The field exists for logging / future cache-keying only.
  */
 export async function resolveAuth() {
     // ── Path 1: env-var credentials (unchanged from pre-fetchproxy behavior).