cchost 0.4.4 → 0.5.0

package/lib/env.js

@@ -8,7 +8,7 @@
 // an API key and is treated with the same care as `.credentials.json`: it is
 // never migrated, never linked, and written with user-only file permissions.
 //
-// Endpoint profiles are created and edited through `cc add <profile> --custom`;
+// Endpoint profiles are created and edited through `cchost add <profile> --custom`;
 // this module supplies the configuration logic that command delegates to.
 
 const fs = require('fs');
@@ -21,6 +21,26 @@ const ENV_FILE = '.cc-env.json';
 // Persisted fields, in canonical serialization order.
 const FIELDS = ['base_url', 'auth_token', 'model', 'opus', 'sonnet', 'haiku', 'subagent'];
 const TIER_FIELDS = ['opus', 'sonnet', 'haiku', 'subagent'];
+// Fields whose value must be a string if present. Optional fields are ignored
+// (treated as absent) when hand-edited to a non-string value.
+const STRICT_STRING_FIELDS = ['base_url', 'auth_token'];
+
+// Environment variables Claude Code reads for authentication. If any of these
+// are inherited by a subscription profile, they can silently override the
+// profile's own OAuth login (and billing).
+const AUTH_ENV_VARS = ['ANTHROPIC_API_KEY', 'ANTHROPIC_AUTH_TOKEN', 'CLAUDE_CODE_OAUTH_TOKEN'];
+
+function authEnvConflicts(env = process.env) {
+  return AUTH_ENV_VARS.filter((key) => env[key]);
+}
+
+// Endpoint profiles must not inherit the parent's Anthropic auth/endpoint
+// settings. Keep only the values buildEnvVars() set for this profile.
+const ENDPOINT_ENV_VARS = [...AUTH_ENV_VARS, 'ANTHROPIC_BASE_URL'];
+
+function endpointEnvToStrip(profileEnv, env = process.env) {
+  return ENDPOINT_ENV_VARS.filter((key) => env[key] && !profileEnv[key]);
+}
 
 // File field -> env var(s) injected into the spawned child.
 const TIER_ENV = {
@@ -80,6 +100,20 @@ function readEnvConfig(profileDir) {
     e.malformed = true;
     throw e;
   }
+  for (const key of STRICT_STRING_FIELDS) {
+    if (data[key] == null) continue;
+    if (typeof data[key] !== 'string') {
+      const e = stateError(`${ENV_FILE} is malformed: field "${key}" must be a string.`);
+      e.malformed = true;
+      throw e;
+    }
+  }
+  // Optional fields are best-effort: a hand-edited non-string value must not
+  // make the whole profile unusable. Treat it as absent instead.
+  for (const key of FIELDS) {
+    if (STRICT_STRING_FIELDS.includes(key)) continue;
+    if (data[key] != null && typeof data[key] !== 'string') delete data[key];
+  }
   return data;
 }
 
@@ -129,9 +163,27 @@ function writeEnvConfig(profileDir, config) {
   const target = envFilePath(profileDir);
   const tmp = path.join(profileDir, `${ENV_FILE}.tmp-${process.pid}`);
   // Write to a temp file then rename, so a crash never leaves a partial file.
-  // Permissions are locked down after the rename: restricting the temp file's
-  // ACL first makes the subsequent rename fail with EPERM on Windows.
-  fs.writeFileSync(tmp, JSON.stringify(out, null, 2) + '\n');
+  // The temp file is created 0600 so an orphaned temp cannot expose the token.
+  // Permissions are locked down again after the rename: restricting the temp
+  // file's ACL first makes the subsequent rename fail with EPERM on Windows.
+  // Remove any stale temp left by pid reuse, then create with O_EXCL so a race
+  // cannot make us write the token into a file with an inherited, looser mode.
+  fs.rmSync(tmp, { force: true });
+  try {
+    fs.writeFileSync(tmp, JSON.stringify(out, null, 2) + '\n', {
+      mode: 0o600,
+      flag: 'wx',
+    });
+  } catch (err) {
+    if (err.code !== 'EEXIST') {
+      try {
+        fs.unlinkSync(tmp);
+      } catch {
+        // best effort cleanup
+      }
+    }
+    throw err;
+  }
   try {
     fs.renameSync(tmp, target);
   } catch (err) {
@@ -173,7 +225,7 @@ function hostOf(url) {
   }
 }
 
-// Endpoint summary for `cc list`. Returns the base-url host, 'subscription'
+// Endpoint summary for `cchost list`. Returns the base-url host, 'subscription'
 // (no endpoint config), or '(invalid config)' for a malformed file — never
 // throws, so a single bad profile cannot break the whole table.
 function endpointSummary(profileDir) {
@@ -382,7 +434,7 @@ async function runWizard(name, existing, io) {
 // Command orchestration (called from cli.js)
 // ---------------------------------------------------------------------------
 
-// Configures a profile's custom endpoint. Called by `cc add <profile> --custom`
+// Configures a profile's custom endpoint. Called by `cchost add <profile> --custom`
 // (both for first-time creation and for editing an existing endpoint profile).
 // `provided` is a partial config of fields supplied via flags.
 // `opts.io` injects wizard IO (tests); `opts.isTTY` overrides TTY detection.
@@ -391,14 +443,14 @@ async function runWizard(name, existing, io) {
 // wizard was cancelled, so the caller can clean up a freshly-created profile.
 async function runConfigure(name, profileDir, provided, opts = {}) {
   if (!fs.existsSync(profileDir)) {
-    throw stateError(`Profile "${name}" does not exist. Create it with: cc add ${name}`);
+    throw stateError(`Profile "${name}" does not exist. Create it with: cchost add ${name}`);
   }
   if (hasOAuthState(profileDir)) {
     throw stateError(
       `Profile '${name}' has OAuth credentials and cannot be converted to a custom endpoint.\n` +
         'A profile is born subscription or endpoint and stays that way.\n' +
         'Create a fresh endpoint profile instead:\n' +
-        '  cc add <new-name> --custom',
+        '  cchost add <new-name> --custom',
     );
   }
 
@@ -434,7 +486,7 @@ async function runConfigure(name, profileDir, provided, opts = {}) {
     const isTTY = opts.isTTY != null ? opts.isTTY : process.stdin.isTTY;
     if (!isTTY) {
       throw usageError(
-        'cc add --custom requires either endpoint flags or an interactive terminal.',
+        'cchost add --custom requires either endpoint flags or an interactive terminal.',
       );
     }
     io = defaultWizardIo();
@@ -455,6 +507,10 @@ module.exports = {
   ENV_FILE,
   FIELDS,
   TIER_FIELDS,
+  AUTH_ENV_VARS,
+  authEnvConflicts,
+  ENDPOINT_ENV_VARS,
+  endpointEnvToStrip,
   envFilePath,
   hasEnvConfig,
   readEnvConfig,

package/lib/profiles.js

@@ -102,20 +102,30 @@ function addProfile(name) {
   return { dir };
 }
 
-function readEmail(dir) {
+// Single read/parse of a profile's .claude.json. Missing or malformed JSON is
+// treated as absent state so one bad profile cannot break `cchost list`.
+function readClaudeJson(dir) {
   try {
     const raw = fs.readFileSync(path.join(dir, '.claude.json'), 'utf8');
-    if (!raw.trim()) return '';
+    if (!raw.trim()) return null;
     const data = JSON.parse(raw);
-    if (data && data.oauthAccount && typeof data.oauthAccount.emailAddress === 'string') {
-      return data.oauthAccount.emailAddress;
-    }
-    return '';
+    return data && typeof data === 'object' && !Array.isArray(data) ? data : null;
   } catch {
-    return '';
+    return null;
   }
 }
 
+function emailFromClaude(data) {
+  if (data && data.oauthAccount && typeof data.oauthAccount.emailAddress === 'string') {
+    return data.oauthAccount.emailAddress;
+  }
+  return '';
+}
+
+function readEmail(dir) {
+  return emailFromClaude(readClaudeJson(dir));
+}
+
 function hasCredentials(dir) {
   try {
     return fs.existsSync(path.join(dir, '.credentials.json'));
@@ -124,7 +134,33 @@ function hasCredentials(dir) {
   }
 }
 
-function listProfiles() {
+// Where this profile's Claude Code credentials live:
+//   'file'     — .credentials.json in the profile (Windows/Linux)
+//   'keychain' — inferred from .claude.json on macOS; the token is in a
+//                Keychain entry namespaced by the profile's exact path
+//   'none'     — no sign of a login
+function credentialSourceFrom(hasFile, data, platform) {
+  if (hasFile) return 'file';
+  if (platform === 'darwin' && data && data.oauthAccount != null) return 'keychain';
+  return 'none';
+}
+
+function credentialSource(dir, platform = process.platform) {
+  return credentialSourceFrom(hasCredentials(dir), readClaudeJson(dir), platform);
+}
+
+// Everything `cchost list` needs about one profile, read from one parse.
+function readProfile(dir, platform = process.platform) {
+  const data = readClaudeJson(dir);
+  const credentialSource = credentialSourceFrom(hasCredentials(dir), data, platform);
+  return {
+    loggedIn: credentialSource !== 'none',
+    credentialSource,
+    email: emailFromClaude(data),
+  };
+}
+
+function listProfiles(platform = process.platform) {
   const base = baseDir();
   if (!fs.existsSync(base)) return [];
   let entries;
@@ -138,12 +174,7 @@ function listProfiles() {
     if (!ent.isDirectory()) continue;
     const name = ent.name;
     const dir = path.join(base, name);
-    out.push({
-      name,
-      dir,
-      loggedIn: hasCredentials(dir),
-      email: readEmail(dir),
-    });
+    out.push({ name, dir, ...readProfile(dir, platform) });
   }
   out.sort((a, b) => a.name.localeCompare(b.name));
   return out;
@@ -159,6 +190,8 @@ module.exports = {
   ensureProfileDir,
   readEmail,
   hasCredentials,
+  credentialSource,
+  readProfile,
   listProfiles,
   addProfile,
 };

package/lib/share.js

@@ -180,6 +180,30 @@ function createResourceLink(target, link, resource) {
   }
 }
 
+// Where one resource of a profile currently stands. Returns one of:
+//   'shared'       — linked to ~/.claude/ (symlink, junction, or hard link)
+//   'private'      — a real file/dir with content, unique to this profile
+//   'empty'        — a real but empty file/dir (link would replace it)
+//   'missing'      — nothing at the path
+//   'foreign-link' — a symlink pointing somewhere other than ~/.claude/
+function resourceState(profileDir, resource) {
+  const p = path.join(profileDir, resource);
+  if (isSharedResource(profileDir, resource)) return 'shared';
+  if (isLink(p)) return 'foreign-link';
+  let st;
+  try {
+    st = fs.statSync(p);
+  } catch {
+    return 'missing';
+  }
+  try {
+    const hasContent = st.isDirectory() ? fs.readdirSync(p).length > 0 : st.size > 0;
+    return hasContent ? 'private' : 'empty';
+  } catch {
+    return 'private';
+  }
+}
+
 // Link each requested resource of a profile into the shared pool (~/.claude/).
 // Each resource is attempted independently — one failure doesn't abort the
 // rest. Returns [{ resource, status, ... }]; status ∈
@@ -188,18 +212,21 @@ function createResourceLink(target, link, resource) {
 // 'refused' is the v0.4.1 behavior when the profile holds private content at
 // the resource path: we do NOT auto-move it into the pool (was the v0.4.0
 // behavior for dirs). The user must move/remove it manually.
+//
+// opts.dryRun reports the same statuses without touching the filesystem.
 function shareLink(profileName, opts = {}) {
+  const dryRun = Boolean(opts.dryRun);
   profiles.validateProfileName(profileName);
   const pdir = profiles.profileDir(profileName);
   if (!fs.existsSync(pdir)) {
     const err = new Error(
-      `Profile "${profileName}" does not exist. Create it with \`cc add ${profileName}\` first.`,
+      `Profile "${profileName}" does not exist. Create it with \`cchost add ${profileName}\` first.`,
     );
     err.exitCode = 1;
     throw err;
   }
   const subset = resolveSubset(opts);
-  ensurePoolResources(subset);
+  if (!dryRun) ensurePoolResources(subset);
   const pool = poolDir();
   const legacyPool = profiles.sharedDir();
   const results = [];
@@ -217,13 +244,22 @@ function shareLink(profileName, opts = {}) {
         }
         if (resolved === path.join(legacyPool, resource)) {
           // Legacy v0.3 pointer — silently relink to the new pool location.
+          if (dryRun) {
+            results.push({ resource, status: 'linked', relinkedFromLegacy: true });
+            continue;
+          }
           removeLink(link);
           const r = createResourceLink(target, link, resource);
           results.push({ resource, status: 'linked', relinkedFromLegacy: true, kind: r.kind });
           continue;
         }
-        // Points somewhere unexpected — don't touch it.
-        results.push({ resource, status: 'already-linked' });
+        // Points somewhere unexpected — don't touch it, but report it as not
+        // shared so callers don't claim the resource is linked.
+        results.push({
+          resource,
+          status: 'foreign-link',
+          message: `symlink points to ${resolved}, not ${target} — left untouched`,
+        });
         continue;
       }
 
@@ -246,14 +282,20 @@ function shareLink(profileName, opts = {}) {
             status: 'refused',
             message:
               `private content exists at ${link} — move or remove it manually, ` +
-              `then re-run \`cc link ${profileName}\``,
+              `then re-run \`cchost link ${profileName}\``,
           });
           continue;
         }
         // Empty private dir — safe to remove and replace with a symlink.
-        try { fs.rmdirSync(link); } catch { /* fall through; create will fail clearly */ }
+        if (!dryRun) {
+          try { fs.rmdirSync(link); } catch { /* fall through; create will fail clearly */ }
+        }
       }
 
+      if (dryRun) {
+        results.push({ resource, status: 'linked' });
+        continue;
+      }
       const r = createResourceLink(target, link, resource);
       results.push({ resource, status: 'linked', kind: r.kind });
     } catch (err) {
@@ -268,7 +310,12 @@ function shareLink(profileName, opts = {}) {
 // collisions, defensive) so the profile keeps its current view.
 // Returns [{ resource, status, ... }]; status ∈
 //   'unlinked' | 'not-linked' | 'failed'
+//
+// opts.dryRun reports the same statuses without touching the filesystem; dir
+// results then carry `items`, the number of top-level entries that would be
+// copied into the profile.
 function shareUnlink(profileName, opts = {}) {
+  const dryRun = Boolean(opts.dryRun);
   profiles.validateProfileName(profileName);
   const pdir = profiles.profileDir(profileName);
   if (!fs.existsSync(pdir)) {
@@ -290,6 +337,15 @@ function shareUnlink(profileName, opts = {}) {
         continue;
       }
 
+      if (dryRun) {
+        const r = { resource, status: 'unlinked' };
+        if (!isFileResource(resource)) {
+          try { r.items = fs.readdirSync(target).length; } catch { r.items = 0; }
+        }
+        results.push(r);
+        continue;
+      }
+
       // Read pool content BEFORE removing the link (in case the link is the
       // only path to it... well, not really — target is reachable directly —
       // but reading first means we can fail without leaving a deleted link).
@@ -783,6 +839,7 @@ module.exports = {
   isFileResource,
   isLink,
   isSharedResource,
+  resourceState,
   removeLink,
   shareLink,
   shareUnlink,

package/lib/spawn.js

@@ -155,7 +155,7 @@ function platformSpawn(bin, args, opts) {
   return spawn(bin, args, opts);
 }
 
-function spawnClaude({ args = [], profileDir = null, extraEnv = {} } = {}) {
+function spawnClaude({ args = [], profileDir = null, extraEnv = {}, unsetEnv = [] } = {}) {
   const bin = findClaude();
   if (!bin) {
     const err = new Error(
@@ -169,6 +169,7 @@ function spawnClaude({ args = [], profileDir = null, extraEnv = {} } = {}) {
   warnIfOld(bin);
 
   const childEnv = { ...process.env, ...extraEnv };
+  for (const name of unsetEnv) delete childEnv[name];
   if (profileDir) {
     childEnv.CLAUDE_CONFIG_DIR = profileDir;
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cchost",
-  "version": "0.4.4",
+  "version": "0.5.0",
   "description": "Multi-account profile manager for Claude Code — switch accounts, share skills/agents/projects, route to custom endpoints. Works on Windows, Linux, and macOS.",
   "keywords": [
     "claude",
@@ -26,6 +26,7 @@
     "url": "git+https://github.com/allenhack638/cchost.git"
   },
   "bin": {
+    "cchost": "bin/cc.js",
     "cc": "bin/cc.js"
   },
   "engines": {
@@ -47,4 +48,4 @@
   "devDependencies": {
     "vitest": "^2.1.0"
   }
-}
+}