cchost 0.3.1 → 0.4.1

package/lib/cli.js

@@ -6,26 +6,35 @@ const readline = require('readline');
 
 const profiles = require('./profiles');
 const share = require('./share');
-const migrateLib = require('./migrate');
+const copyLib = require('./copy');
 const envLib = require('./env');
 const { spawnClaude } = require('./spawn');
 const { renderTable } = require('./format');
 const color = require('./color');
+const { renderBanner } = require('./banner');
 
 const HELP = `cc - Multi-profile launcher for Claude Code
 
 Usage:
-  cc add <profile> [--custom [...]]                Create a profile (--custom: route through a custom API endpoint)
+  cc add <profile> [--custom [...]]                Create a profile (auto-links all 7 resources to ~/.claude/)
   cc use <profile> [...args]                       Launch Claude under a named profile
-  cc list [<profile>] [--json] [--reveal]          List all profiles, or show one profile in detail
-  cc migrate <src> <dest> [--force]                Copy artifact dirs (and config files) between profiles
-  cc link <p>...                                   Link each profile's artifact dirs to ~/.claude-shared/
-  cc unlink <profile>                              Restore a profile's private artifact dirs
-  cc remove <profile>                              Delete a profile and all its data (typed confirmation)
+  cc list [<profile>] [--json] [--reveal]          List profiles, or show one in detail
+  cc copy default <profile> [--force]              Copy ~/.claude/ resources into a profile (only when unlinked)
+  cc link <p>... [--projects|--tools|--config]     (Re-)link a profile's resources to ~/.claude/
+  cc unlink <profile> [--projects|--tools|--config]  Restore a profile's private resources (non-destructive)
+  cc remove <profile> [--force]                    Delete a profile and all its data
   cc doctor [--fix [--force]] [--json]             Diagnose environment, storage, and platform issues
   cc help [command]                                Show usage (optionally for a single command)
   cc --version                                     Print the installed cchost version
 
+Shared resources (linked into ~/.claude/ by default):
+  --projects   projects/                                 (session history)
+  --tools      skills/  agents/  commands/               (user tooling)
+  --config     mcp.json  settings.json  CLAUDE.md        (MCP, settings, user memory)
+
+Never shared (stay per-profile):
+  .credentials.json  .claude.json  .cc-env.json          (identity / auth)
+
 Profiles live in ~/.claude-profiles/<profile>/ and become CLAUDE_CONFIG_DIR
 for that launch. Args after the profile name are forwarded verbatim to claude.
 `;
@@ -33,7 +42,10 @@ for that launch. Args after the profile name are forwarded verbatim to claude.
 const HELP_BY_CMD = {
   add: `cc add <profile> [--custom [--base-url=URL --token=TOKEN ...]]
 
-Create a new profile directory without launching Claude.
+Create a new profile directory without launching Claude. All 7 shared
+resources (projects/, skills/, agents/, commands/, mcp.json, settings.json,
+CLAUDE.md) are auto-linked into ~/.claude/ so they're visible to every
+profile (and to bare \`claude\`) from the moment the profile is created.
 
   cc add <profile>
       Create a regular profile. It logs in with your Anthropic
@@ -50,31 +62,27 @@ Create a new profile directory without launching Claude.
                           [--haiku=NAME] [--subagent=NAME]
       Same, non-interactive. --base-url and --token are required.
 
-Re-running 'cc add <profile> --custom' on an existing endpoint profile
-EDITS its configuration: the wizard prefills current values, and with
-flags only the flags you pass are changed. View a config with
-'cc list <profile>'.
+Re-running 'cc add <profile> --custom' on an existing endpoint profile EDITS
+its configuration. View any profile with 'cc list <profile>'.
 
 Billing: a custom-endpoint profile bills through the third-party provider,
 NOT your Anthropic subscription. A profile is born subscription or endpoint
-and stays that way — 'cc add --custom' refuses a profile that already has
-Anthropic OAuth credentials.
+and stays that way.
 
 The endpoint config lives at ~/.claude-profiles/<profile>/.cc-env.json with
-user-only permissions. It is never migrated and never linked.
+user-only permissions. It is never linked and never copied.
 
 Examples:
   cc add work
   cc add kimi --custom
   cc add kimi --custom --base-url=https://api.moonshot.ai/anthropic --token=sk-... --model=kimi-k2.5
-  cc add kimi --custom --model=kimi-k3       # edit just the model later
 `,
   use: `cc use <profile> [...args]
 
 Launch Claude under a named profile. The profile must already exist (create
 it with 'cc add <profile>'). Its directory under ~/.claude-profiles/<profile>/
-becomes CLAUDE_CONFIG_DIR for the spawned claude — credentials, sessions,
-projects, plugins, and history are all isolated.
+becomes CLAUDE_CONFIG_DIR for the spawned claude — credentials and per-
+profile config are isolated; the 7 shared resources are visible via symlinks.
 
 All args after the profile name are forwarded verbatim to claude.
 
@@ -90,98 +98,129 @@ Without a profile name: list every profile as a table.
 Columns:
   Profile   - profile name
   LoggedIn  - true if .credentials.json exists
-  Email     - account email from .claude.json; - if not yet logged in
-  Shared    - N/4 linked to ~/.claude-shared/ (projects, skills, agents, commands)
-              4/4 = fully shared, 0/4 = fully isolated
-              (sessions/ is transient per-process state and is never shared)
-  Endpoint  - custom-endpoint host from .cc-env.json, or "subscription" if the
-              profile uses Anthropic's subscription OAuth
+  Email     - account email from .claude.json (masked by default; pass
+              --reveal to show the full value); - if not yet logged in
+  Shared    - N/7 resources linked to ~/.claude/. 7/7 = fully shared (the
+              v0.4.1 default), 0/7 = fully private
+  Endpoint  - custom-endpoint host from .cc-env.json, or "subscription" if
+              the profile uses Anthropic's subscription OAuth
 
 With a profile name: print that one profile's detail, including its custom
 endpoint configuration if it has one. The API token is masked by default;
---reveal prints it in full — do not paste that output anywhere.
-
-  cc list                      Table of all profiles
-  cc list --json               Same, as a JSON array
-  cc list <profile>            Detail for a single profile
-  cc list <profile> --reveal   Detail with the full API token shown
-  cc list <profile> --json     Detail as a JSON object (token always masked)
+--reveal prints both the token and the full email — do not paste that output
+anywhere.
+
+  cc list                            Table of all profiles (emails masked)
+  cc list --reveal                   Table with full emails shown
+  cc list --json                     Same, as a JSON array (always masked)
+  cc list <profile>                  Detail for a single profile
+  cc list <profile> --reveal         Detail with the full token + email shown
+  cc list <profile> --json           Detail as a JSON object (always masked)
 `,
-  migrate: `cc migrate <src> <dest> [--force]
+  copy: `cc copy default <profile> [--force]
 
-Copy artifact directories from a source to a destination. This is a COPY — the
-source is left untouched. sessions/ is never migrated (transient per-process state).
+Copy ~/.claude/ resources into a profile. Useful only when the profile has
+'unlinked' one or more resources (private content); for fresh v0.4.1
+profiles every resource is symlinked, so 'cc copy' is a no-op.
 
-  <src>:   default | shared
-           default = ~/.claude/        (Claude's built-in non-profile data)
-           shared  = ~/.claude-shared/ (the cc shared pool)
-  <dest>:  shared | <profile-name>
+  <src>:   default  (= ~/.claude/, Claude Code's own config dir)
+  <dest>:  <profile-name>
 
-Directories copied in all cases:
-  projects/, skills/, agents/, commands/
+Resources considered (same 7 as everywhere):
+  --projects   projects/
+  --tools      skills/  agents/  commands/
+  --config     mcp.json  settings.json  CLAUDE.md
 
-Extra files copied only when src=default and dest=<profile>:
-  mcp.json, settings.json, CLAUDE.md
-  (These carry per-profile config and are NOT copied to shared.)
+For each resource:
+  - If the destination is shared via symlink/hard-link to the source → skipped
+  - Else, copy with skip-on-collision (entries already at the destination win)
 
-Never copied: .credentials.json, .claude.json, sessions/, plugins/
-
-Collision behavior (default): existing entries at the destination are silently
-skipped — the source entry is left alone.
-
---force  Overwrite existing entries instead of skipping.
-         Warning: existing content at the destination will be cleared.
+--force  Overwrite collisions at the destination instead of skipping.
 
 Examples:
-  cc migrate default work            # copy ~/.claude/* to ~/.claude-profiles/work/
-  cc migrate default shared          # copy dirs to ~/.claude-shared/
-  cc migrate shared work             # copy shared dirs to ~/.claude-profiles/work/
-  cc migrate default work --force    # same, overwriting any existing items
+  cc copy default work               # only acts on unlinked resources
+  cc copy default work --force       # overwrite collisions
+
+Removed in v0.4: 'shared' as src/dest. The shared pool IS ~/.claude/ in v0.4
+and is reached via symlinks. Use 'cc link' / 'cc unlink' to manage sharing.
+Note: 'cc migrate' is a deprecated alias for 'cc copy' — it still works but
+will be removed in a future version.
 `,
-  link: `cc link <profile> [<profile>...]
+  link: `cc link <profile> [<profile>...] [--projects|--tools|--config]
 
-Replace each profile's artifact directories with links to ~/.claude-shared/:
-  projects/, skills/, agents/, commands/
+(Re-)link a profile's resources into the shared pool at ~/.claude/. 'cc add'
+already does this for new profiles; 'cc link' is for re-applying it after
+'cc unlink' or for older profiles that pre-date v0.4.1.
 
-Existing content in each directory is migrated into shared first; collisions
-are renamed with a __<profile> suffix (never overwritten). sessions/ (transient
-per-process state) is intentionally never linked — it stays per-profile.
+No flag         link all 7 resources
+--projects      projects/
+--tools         skills/, agents/, commands/
+--config        mcp.json, settings.json, CLAUDE.md
+(flags can be combined: --tools --config)
 
-On Windows, link uses directory junctions (no admin/Developer Mode needed).
-On macOS/Linux, regular symlinks.
+Refuses to overwrite private content: if the profile has a non-empty resource
+that isn't already a symlink, that resource is reported as 'refused' and left
+alone — move or remove it manually, then re-run 'cc link'. The other
+resources are still linked.
 
-Multiple profiles can be linked at once: 'cc link a b c'. Failures are handled
-per directory and per profile: one directory failing does not stop the other
-three, and one profile failing does not stop the rest of the batch. A
-per-directory summary is printed; exit code is 1 if anything failed.
+On Windows, dirs use junctions (no admin/Developer Mode needed). File
+symlinks may require Developer Mode; without it, files fall back to hard
+links so editing-in-place still propagates between profiles.
+
+Examples:
+  cc link work                     # link all 7
+  cc link work --tools             # only skills/, agents/, commands/
+  cc link work --config            # only mcp.json, settings.json, CLAUDE.md
+  cc link a b c                    # link 3 profiles in one shot
 `,
-  unlink: `cc unlink <profile>
+  unlink: `cc unlink <profile> [--projects|--tools|--config]
+
+Break the symlinks and copy current ~/.claude/ content into the profile as
+private resources. Non-destructive: same-name items already private in the
+profile are kept, so re-running unlink is idempotent.
 
-Remove each linked artifact directory (projects/, skills/, agents/, commands/)
-and copy the shared content back into the profile as private dirs.
+No flag         unlink all 7 resources
+--projects      projects/
+--tools         skills/, agents/, commands/
+--config        mcp.json, settings.json, CLAUDE.md
+
+After unlinking, the profile's resource diverges from ~/.claude/. Other
+profiles still see the shared pool.
+
+Examples:
+  cc unlink work                   # full private profile
+  cc unlink work --config          # only mcp.json / settings.json / CLAUDE.md private
+  cc unlink work --tools --config  # skills, agents, commands AND config private
 `,
-  remove: `cc remove <profile>
+  remove: `cc remove <profile> [--force]
 
 Delete a profile and everything inside its directory: credentials, sessions,
-projects, plugins, and history. To confirm, you must type the exact profile
-name — y/n is intentionally not accepted because credential loss is unrecoverable.
+and any private resources. To confirm, you must type the exact profile name —
+y/n is intentionally not accepted because credential loss is unrecoverable.
 
-If the profile's projects/ is a link to ~/.claude-shared/, only the link is
-removed — the shared target is preserved.
+If a profile's resources are symlinks to ~/.claude/, only the symlinks are
+removed — the shared content in ~/.claude/ is preserved for other profiles.
+If any resource is PRIVATE (unlinked), --force is required because its
+content is unique to this profile and will be lost forever.
 `,
   doctor: `cc doctor [--fix [--force]] [--json]
 
 Run diagnostic checks across four groups:
 
-  Environment  Node >=18, claude on PATH, claude >=2.1.140, no conflicting env vars, no cc shadow
-  Storage      ~/.claude-profiles/ writable, .claude.json parseable, junctions/symlinks valid
-  Platform     Windows: OneDrive home, WindowsApps stub, stale ~/bin/cc; Git Bash: cygpath
+  Environment  Node >=18, claude on PATH, claude version, no conflicting env vars
+  Storage      ~/.claude-profiles/ writable, .claude.json parseable, every
+               profile's 7 resource links present and valid; legacy
+               ~/.claude-shared/ folded into ~/.claude/ if still present
+  Platform     Windows: OneDrive home, WindowsApps stub, stale ~/bin/cc;
+               Git Bash: cygpath
   Sanity       Test-spawn claude --version through the same code path cc use uses
 
 Exit codes: 0 = all ok, 1 = warnings, 2 = errors.
 
---fix           Auto-apply safe fixes: create missing dirs, recreate broken junctions
---fix --force   Also apply confirmation-required fixes (e.g. reset a corrupt .claude.json)
+--fix           Auto-apply safe fixes: create missing dirs, recreate broken
+                links, backfill missing resource links
+--fix --force   Also apply confirmation-required fixes (e.g. reset corrupt
+                .claude.json)
 --json          Machine-readable output for CI / scripting
 `,
   help: `cc help [command]
@@ -199,10 +238,13 @@ function usageError(msg) {
 
 function printHelp(cmd) {
   if (cmd && Object.prototype.hasOwnProperty.call(HELP_BY_CMD, cmd)) {
+    // Per-command help: no banner, just the detail.
     process.stdout.write(HELP_BY_CMD[cmd]);
-  } else {
-    process.stdout.write(HELP);
+    return;
   }
+  // Top-level help: banner + summary.
+  process.stdout.write(renderBanner());
+  process.stdout.write(HELP);
 }
 
 function prompt(question) {
@@ -274,6 +316,16 @@ function parseFlagsStrict(args, flagNames, { allowPositional = false } = {}) {
   return { flags, positional };
 }
 
+// Count how many of the 7 shared resources a profile currently has linked
+// (symlink OR — on Windows file fallback — hard link).
+function countSharedResources(profileDir) {
+  let n = 0;
+  for (const r of share.SHARED_RESOURCES) {
+    if (share.isSharedResource(profileDir, r)) n += 1;
+  }
+  return n;
+}
+
 // Flag name -> .cc-env.json field, for `cc add --custom`.
 const ENDPOINT_VALUE_FLAGS = {
   '--base-url': 'base_url',
@@ -324,45 +376,40 @@ async function cmdAdd(rest) {
     );
   }
 
-  // Plain subscription profile.
+  // Fold any legacy ~/.claude-shared/ pool into ~/.claude/ before any link work.
+  runLegacyPoolMigration();
+
   if (!custom) {
     const { dir } = profiles.addProfile(name);
     console.log(`Created profile "${name}" at ${dir}.`);
+    autoLinkArtifacts(name);
     console.log(`Next: cc use ${name}`);
     return 0;
   }
 
-  // Custom endpoint profile. A fresh profile is created and configured; an
-  // existing endpoint profile is edited in place. Either way the directory
-  // must exist before runConfigure reads/writes .cc-env.json inside it.
+  // Custom endpoint profile.
   const dir = profiles.profileDir(name);
   const existed = fs.existsSync(dir);
-  if (!existed) profiles.addProfile(name);
+  if (!existed) {
+    profiles.addProfile(name);
+    autoLinkArtifacts(name);
+  }
 
   let result;
   try {
     result = await envLib.runConfigure(name, dir, provided);
   } catch (err) {
-    // A freshly-created profile that could not be configured leaves nothing
-    // behind — `cc add --custom` is atomic.
     if (!existed) {
       try {
         removeRecursivelyPreservingLinks(dir);
-      } catch {
-        // best-effort cleanup
-      }
+      } catch { /* best-effort */ }
     }
     throw err;
   }
 
   if (!result.written) {
-    // Wizard cancelled.
     if (!existed) {
-      try {
-        removeRecursivelyPreservingLinks(dir);
-      } catch {
-        // best-effort cleanup
-      }
+      try { removeRecursivelyPreservingLinks(dir); } catch { /* best-effort */ }
       console.log(`Cancelled. Profile "${name}" was not created.`);
     } else {
       console.log('Cancelled. No changes written.');
@@ -374,6 +421,66 @@ async function cmdAdd(rest) {
   return result.code;
 }
 
+// One-time v0.3 → v0.4 migration. Folds ~/.claude-shared/ into ~/.claude/ and
+// re-points existing profile symlinks. Quiet when there's no legacy pool.
+function runLegacyPoolMigration() {
+  let result;
+  try {
+    result = share.migrateLegacyPool({ log: (line) => console.log(line) });
+  } catch (err) {
+    process.stderr.write(
+      color.stderr.yellow(`  warning: legacy pool migration failed: ${err.message}`) + '\n',
+    );
+    return;
+  }
+  if (!result.migrated) return;
+  const moved = result.moves.length;
+  const relinked = result.relinked.length;
+  console.log(
+    `Migrated legacy ~/.claude-shared/ into ~/.claude/ ` +
+      `(${moved} item(s) moved, ${relinked} profile link(s) repointed).`,
+  );
+  for (const f of result.failures) {
+    process.stderr.write(
+      color.stderr.yellow(`  warning: ${JSON.stringify(f)}`) + '\n',
+    );
+  }
+}
+
+// On profile creation, symlink all 7 resources into ~/.claude/. Failures emit
+// a warning but do NOT abort cc add — the profile is still usable, and the
+// user can re-run `cc link <name>` to retry.
+function autoLinkArtifacts(name) {
+  let results;
+  try {
+    results = share.shareLink(name);
+  } catch (err) {
+    process.stderr.write(
+      color.stderr.yellow(
+        `  warning: could not link resources for "${name}": ${err.message}`,
+      ) + '\n',
+    );
+    return;
+  }
+  const failed = results.filter((r) => r.status === 'failed' || r.status === 'refused');
+  const linked = results.length - failed.length;
+  if (failed.length === 0) {
+    console.log(`  Linked ${linked}/${results.length} resources to ~/.claude/.`);
+    return;
+  }
+  console.log(`  Linked ${linked}/${results.length} resources to ~/.claude/.`);
+  for (const r of failed) {
+    process.stderr.write(
+      color.stderr.yellow(`  warning: ${r.resource} not linked — ${r.message}`) + '\n',
+    );
+  }
+  process.stderr.write(
+    color.stderr.yellow(
+      `  Re-run \`cc link ${name}\` after resolving the above.`,
+    ) + '\n',
+  );
+}
+
 async function cmdUse(rest) {
   const [name, ...passthrough] = rest;
   if (!name) throw usageError('Usage: cc use <profile> [...args]');
@@ -385,10 +492,8 @@ async function cmdUse(rest) {
     throw err;
   }
 
-  // If the profile carries a custom-endpoint config, inject the corresponding
-  // env vars so Claude Code routes through the third-party provider.
   let extraEnv = {};
-  const envConfig = envLib.readEnvConfig(dir); // throws on a malformed file
+  const envConfig = envLib.readEnvConfig(dir);
   if (envConfig) {
     extraEnv = envLib.buildEnvVars(envConfig);
     const host = envConfig.base_url ? envLib.hostOf(envConfig.base_url) : '(unknown)';
@@ -413,12 +518,11 @@ function cmdListOne(name, { json, reveal }) {
     throw e;
   }
 
-  const total = share.SHARED_SUBDIRS.length;
-  const sharedCount = share.SHARED_SUBDIRS.filter((sub) =>
-    isLinkLike(path.join(dir, sub)),
-  ).length;
+  const total = share.SHARED_RESOURCES.length;
+  const sharedCount = countSharedResources(dir);
   const loggedIn = profiles.hasCredentials(dir);
   const email = profiles.readEmail(dir);
+  const displayEmail = reveal ? email : (email ? envLib.maskEmail(email) : email);
 
   let config = null;
   let configError = false;
@@ -433,14 +537,13 @@ function cmdListOne(name, { json, reveal }) {
       name,
       dir,
       loggedIn,
-      email,
+      email: displayEmail,
       shared: sharedCount,
       endpoint: envLib.endpointSummary(dir),
     };
     if (config) {
       obj.endpointConfig = {
         base_url: config.base_url || null,
-        // The token is always masked in JSON output — scripts never need it.
         auth_token: config.auth_token ? envLib.maskToken(config.auth_token) : null,
         model: config.model || null,
         opus: config.opus || config.model || null,
@@ -456,7 +559,7 @@ function cmdListOne(name, { json, reveal }) {
   console.log(`Profile:   ${name}`);
   console.log(`Directory: ${dir}`);
   console.log(`LoggedIn:  ${loggedIn ? 'true' : 'false'}`);
-  console.log(`Email:     ${email || '-'}`);
+  console.log(`Email:     ${displayEmail || '-'}`);
   console.log(`Shared:    ${sharedCount}/${total}`);
 
   if (configError) {
@@ -484,16 +587,18 @@ function cmdListOne(name, { json, reveal }) {
   console.log(`  Subagent:  ${config.subagent || config.model || '-'}`);
   if (reveal) {
     console.log('');
-    console.log('WARNING: the full API key is printed above. Do not paste this output');
-    console.log('into chats, issues, screenshots, or logs.');
+    console.log('WARNING: the full API key and email are printed above. Do not paste this');
+    console.log('output into chats, issues, screenshots, or logs.');
   }
   return 0;
 }
 
 function cmdList(rest) {
-  const { flags, positional } = parseFlagsStrict(rest, ['--json', '--reveal'], {
-    allowPositional: true,
-  });
+  const { flags, positional } = parseFlagsStrict(
+    rest,
+    ['--json', '--reveal'],
+    { allowPositional: true },
+  );
   const json = flags.has('--json');
   const reveal = flags.has('--reveal');
   const [name, ...extra] = positional;
@@ -502,28 +607,26 @@ function cmdList(rest) {
   if (name) {
     return cmdListOne(name, { json, reveal });
   }
-  if (reveal) {
-    throw usageError('--reveal requires a profile name: cc list <profile> --reveal');
+  if (json && reveal) {
+    throw usageError('--reveal cannot be combined with --json.');
   }
 
   const list = profiles.listProfiles();
-  const total = share.SHARED_SUBDIRS.length;
+  const total = share.SHARED_RESOURCES.length;
 
   const enriched = list.map((p) => {
-    const sharedCount = share.SHARED_SUBDIRS.filter(sub =>
-      isLinkLike(path.join(p.dir, sub))
-    ).length;
+    const sharedCount = countSharedResources(p.dir);
     return {
       name: p.name,
       dir: p.dir,
       loggedIn: p.loggedIn,
-      email: p.email,
+      email: reveal ? p.email : (p.email ? envLib.maskEmail(p.email) : p.email),
       shared: sharedCount,
       endpoint: envLib.endpointSummary(p.dir),
     };
   });
 
-  if (flags.has('--json')) {
+  if (json) {
     process.stdout.write(JSON.stringify(enriched, null, 2) + '\n');
     return 0;
   }
@@ -548,9 +651,32 @@ function cmdList(rest) {
   return 0;
 }
 
+// True if the profile has any private (non-shared, non-empty) resource that
+// would be permanently lost on remove.
+function hasPrivateContent(dir) {
+  for (const r of share.SHARED_RESOURCES) {
+    const p = path.join(dir, r);
+    if (!fs.existsSync(p)) continue;
+    if (share.isSharedResource(dir, r)) continue;
+    if (share.isFileResource(r)) {
+      try {
+        if (fs.statSync(p).size > 0) return true;
+      } catch { /* skip */ }
+    } else {
+      try {
+        if (fs.readdirSync(p).length > 0) return true;
+      } catch { /* skip */ }
+    }
+  }
+  return false;
+}
+
 async function cmdRemove(rest) {
-  const [name] = rest;
-  if (!name) throw usageError('Usage: cc remove <profile>');
+  const { flags, positional } = parseFlagsStrict(rest, ['--force'], { allowPositional: true });
+  const [name, ...extra] = positional;
+  if (!name) throw usageError('Usage: cc remove <profile> [--force]');
+  if (extra.length > 0) throw usageError(`Unexpected argument: ${extra[0]}`);
+  const force = flags.has('--force');
   profiles.validateProfileName(name);
   const dir = profiles.profileDir(name);
   if (!fs.existsSync(dir)) {
@@ -558,13 +684,24 @@ async function cmdRemove(rest) {
     err.exitCode = 1;
     throw err;
   }
+
+  if (hasPrivateContent(dir) && !force) {
+    const err = new Error(
+      `Profile "${name}" has private (unlinked) resources whose content is not ` +
+        `in ~/.claude/. Removing the profile will delete that content permanently.\n` +
+        `Re-run with --force to confirm: cc remove ${name} --force`,
+    );
+    err.exitCode = 1;
+    throw err;
+  }
+
   console.log('This will permanently delete:');
   console.log(`  ${dir}`);
-  console.log('including credentials, sessions, projects, plugins, and history.');
-  for (const sub of share.SHARED_SUBDIRS) {
+  console.log('including credentials, sessions, and any private resources.');
+  for (const sub of share.SHARED_RESOURCES) {
     const sub_p = path.join(dir, sub);
-    if (isLinkLike(sub_p)) {
-      console.log(`  (${sub}/ is a link to shared storage — only the link will be removed)`);
+    if (share.isSharedResource(dir, sub)) {
+      console.log(`  (${sub} is shared with ~/.claude/ — only the link will be removed)`);
     }
   }
   const answer = await prompt(`Type the profile name "${name}" to confirm: `);
@@ -582,34 +719,60 @@ async function cmdRemove(rest) {
 }
 
 async function cmdLink(rest) {
-  if (rest.length === 0) throw usageError('Usage: cc link <profile> [<profile>...]');
-  const multi = rest.length > 1;
+  const { flags, positional } = parseFlagsStrict(
+    rest,
+    ['--tools', '--projects', '--config'],
+    { allowPositional: true },
+  );
+  if (positional.length === 0) {
+    throw usageError(
+      'Usage: cc link <profile> [<profile>...] [--projects|--tools|--config]',
+    );
+  }
+  const opts = {
+    tools: flags.has('--tools'),
+    projects: flags.has('--projects'),
+    config: flags.has('--config'),
+  };
+  const multi = positional.length > 1;
   const summary = [];
-  for (const name of rest) {
+  for (const name of positional) {
     if (multi) console.log(`\n[${name}]`);
     let results;
     try {
-      results = share.shareLink(name);
+      results = share.shareLink(name, opts);
     } catch (err) {
-      // Profile-level failure (invalid name, profile missing) — nothing linked.
       process.stderr.write(color.stderr.red(`  error: ${err.message}`) + '\n');
-      summary.push({ name, linked: 0, total: share.SHARED_SUBDIRS.length, error: err.message });
+      summary.push({ name, linked: 0, total: 0, error: err.message });
       continue;
     }
     for (const r of results) {
+      const label = share.isFileResource(r.resource) ? r.resource : `${r.resource}/`;
       if (r.status === 'failed') {
-        process.stderr.write(color.stderr.red(`  ${r.sub}: failed — ${r.message}`) + '\n');
+        process.stderr.write(color.stderr.red(`  ${label}: failed — ${r.message}`) + '\n');
+      } else if (r.status === 'refused') {
+        process.stderr.write(color.stderr.yellow(`  ${label}: refused — ${r.message}`) + '\n');
       } else if (r.status === 'already-linked') {
-        console.log(`  ${r.sub}: already linked`);
+        console.log(`  ${label}: already linked`);
+      } else if (r.relinkedFromLegacy) {
+        console.log(`  ${label}: relinked (was pointing at legacy ~/.claude-shared/)`);
       } else {
-        const note = r.moved ? ` (migrated ${r.moved} item(s) into shared)` : '';
-        console.log(`  ${r.sub}: linked${note}`);
+        const note = r.kind === 'hardlink' ? ' (hard link — enable Windows Developer Mode for a true symlink)' : '';
+        console.log(`  ${label}: linked${note}`);
       }
     }
-    const failed = results.filter((r) => r.status === 'failed');
+    const failed = results.filter((r) => r.status === 'failed' || r.status === 'refused');
     const linked = results.length - failed.length;
-    console.log(`  ${linked}/${results.length} directories linked${failed.length ? `, ${failed.length} failed` : ''}.`);
-    summary.push({ name, linked, total: results.length, failed: failed.map((f) => f.sub) });
+    console.log(
+      `  ${linked}/${results.length} linked` +
+        (failed.length ? `, ${failed.length} not linked` : '') + '.',
+    );
+    summary.push({
+      name,
+      linked,
+      total: results.length,
+      failed: failed.map((f) => f.resource),
+    });
   }
 
   const anyFailure = summary.some((s) => s.error || (s.failed && s.failed.length));
@@ -619,7 +782,7 @@ async function cmdLink(rest) {
       if (s.error) {
         console.log(`  ${s.name}: error — ${s.error}`);
       } else if (s.failed && s.failed.length) {
-        console.log(`  ${s.name}: ${s.linked}/${s.total} linked (failed: ${s.failed.join(', ')})`);
+        console.log(`  ${s.name}: ${s.linked}/${s.total} linked (not linked: ${s.failed.join(', ')})`);
       } else {
         console.log(`  ${s.name}: ${s.linked}/${s.total} linked`);
       }
@@ -629,18 +792,32 @@ async function cmdLink(rest) {
 }
 
 async function cmdUnlink(rest) {
-  const [name] = rest;
-  if (!name) throw usageError('Usage: cc unlink <profile>');
-  const results = share.shareUnlink(name);
+  const { flags, positional } = parseFlagsStrict(
+    rest,
+    ['--tools', '--projects', '--config'],
+    { allowPositional: true },
+  );
+  const [name, ...extra] = positional;
+  if (!name) {
+    throw usageError('Usage: cc unlink <profile> [--projects|--tools|--config]');
+  }
+  if (extra.length > 0) throw usageError(`Unexpected argument: ${extra[0]}`);
+  const opts = {
+    tools: flags.has('--tools'),
+    projects: flags.has('--projects'),
+    config: flags.has('--config'),
+  };
+  const results = share.shareUnlink(name, opts);
   let anyFailure = false;
   for (const r of results) {
+    const label = share.isFileResource(r.resource) ? r.resource : `${r.resource}/`;
     if (r.status === 'failed') {
       anyFailure = true;
-      process.stderr.write(color.stderr.red(`  ${r.sub}: failed — ${r.message}`) + '\n');
+      process.stderr.write(color.stderr.red(`  ${label}: failed — ${r.message}`) + '\n');
     } else if (r.status === 'not-linked') {
-      console.log(`  ${r.sub}: not linked, skipping`);
+      console.log(`  ${label}: not linked, skipping`);
     } else {
-      console.log(`  ${r.sub}: unlinked, content copied back`);
+      console.log(`  ${label}: unlinked, content copied back`);
     }
   }
   return anyFailure ? 1 : 0;
@@ -656,19 +833,31 @@ async function cmdDoctor(rest) {
   return doctor.runDoctor({ fix, force, json, prompt });
 }
 
-async function cmdMigrate(rest) {
+async function cmdCopy(rest) {
   const { flags, positional } = parseFlagsStrict(rest, ['--force'], { allowPositional: true });
   const [src, dest, ...extra] = positional;
-  if (!src || !dest) throw usageError('Usage: cc migrate <src> <dest> [--force]');
+  if (!src || !dest) throw usageError('Usage: cc copy <src> <dest> [--force]');
   if (extra.length > 0) throw usageError(`Unexpected extra arguments: ${extra.join(' ')}`);
   const force = flags.has('--force');
   if (force) {
-    process.stdout.write('Warning: --force is set. Existing items at the destination will be overwritten and their current content will be cleared.\n');
+    process.stdout.write(
+      'Warning: --force is set. Existing items at the destination will be overwritten.\n',
+    );
   }
-  migrateLib.migrate(src, dest, { force });
+  copyLib.copy(src, dest, { force });
   return 0;
 }
 
+async function cmdMigrate(rest) {
+  process.stderr.write(
+    color.stderr.yellow(
+      "[cchost] 'cc migrate' is deprecated — use 'cc copy' instead. " +
+        'This alias will be removed in a future version.',
+    ) + '\n',
+  );
+  return cmdCopy(rest);
+}
+
 async function run(argv) {
   const [action, ...rest] = argv;
   if (!action || action === '--help' || action === '-h') {
@@ -685,7 +874,6 @@ async function run(argv) {
     return 0;
   }
   if (action === 'env') {
-    // `cc env` was removed in v0.3.1 — point upgraders at the new commands.
     process.stderr.write(
       color.stderr.red(
         "'cc env' was removed in v0.3.1. Configure a custom endpoint with " +
@@ -701,6 +889,8 @@ async function run(argv) {
       return await cmdUse(rest);
     case 'list':
       return cmdList(rest);
+    case 'copy':
+      return await cmdCopy(rest);
     case 'migrate':
       return await cmdMigrate(rest);
     case 'link':