claude-multiacc 2.0.29 → 2.0.30

package/docs/ACCOUNT_OPERATIONS.md

@@ -131,6 +131,15 @@ manually via:
 claude-accounts sync      # and codex-accounts sync for the codex pool
 ```
 
+Account creation and sync seed missing settings from the machine's default provider
+directory and link its global instructions: `~/.claude/CLAUDE.md` for Claude,
+`~/.codex/AGENTS.md` for Codex. Existing account settings (including models) and
+instruction files or links are preserved. The addon does not generate instructions
+or enable/disable agents. To share newly created global instructions with existing
+accounts, run `claude-accounts sync --no-server` and/or `codex-accounts sync --no-server`.
+This only repairs accounts in the manifest, leaving retired directories untouched.
+Global instruction files remain machine-local; sync does not copy them between hosts.
+
 Targets are the resolved sync target — env override, else the manifest's
 `server`/`server_root`/`server_repo` (the Linux box), see *Pointing sync somewhere else*
 below — plus an optional `peers` array for additional machines (e.g. a second Mac):

package/lib/common.sh

@@ -677,7 +677,7 @@ codex_share_state_index() { # $1 acct dir — seed time: whatever index names ex
 }
 
 # Seed an account config dir so headless runs never prompt.
-#   claude: stripped .claude.json, copied settings.json, shared projects/ symlink
+#   claude: stripped .claude.json, copied settings.json, shared CLAUDE.md + projects/
 #           (shared history => --continue/--resume work regardless of picked account).
 #   codex:  copied config.toml (carries project trust + settings, no identity),
 #           shared sessions/ symlink (=> `codex resume` finds every session) with the
@@ -718,6 +718,9 @@ PYEOF
   if [ ! -f "$d/settings.json" ] && [ -f "$HOME/.claude/settings.json" ]; then
     cp "$HOME/.claude/settings.json" "$d/settings.json" 2>/dev/null || true
   fi
+  if [ ! -e "$d/CLAUDE.md" ] && [ -f "$HOME/.claude/CLAUDE.md" ]; then
+    ln -s "$HOME/.claude/CLAUDE.md" "$d/CLAUDE.md" 2>/dev/null || true
+  fi
   if [ ! -e "$d/projects" ] && [ -d "$HOME/.claude/projects" ]; then
     ln -s "$HOME/.claude/projects" "$d/projects" 2>/dev/null || true
   fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-multiacc",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "description": "Unified Claude Code and OpenAI Codex subscription pooling with quota-aware selection.",
   "type": "module",
   "bin": {
@@ -55,7 +55,9 @@
   },
   "scripts": {
     "postinstall": "node scripts/postinstall.mjs",
-    "test": "bash tests/run-tests.sh && python3 tests/test_selector.py && npm run test:commands",
+    "test": "npm run test:core && npm run test:seeding && npm run test:commands",
+    "test:core": "bash tests/run-tests.sh && python3 tests/test_selector.py",
+    "test:seeding": "python3 tests/test_account_seeding.py",
     "test:commands": "python3 tests/test_packaged_commands.py"
   },
   "dependencies": {

package/tests/test_account_seeding.py

@@ -0,0 +1,112 @@
+#!/usr/bin/env python3
+"""Account seeding preserves settings and shares machine-local global instructions."""
+
+import json
+import os
+from pathlib import Path
+import subprocess
+import tempfile
+import unittest
+
+
+REPO = Path(__file__).resolve().parents[1]
+PROVIDERS = (("claude", "CLAUDE.md", "settings.json"), ("codex", "AGENTS.md", "config.toml"))
+
+
+class AccountSeedingTests(unittest.TestCase):
+    def setUp(self):
+        self.work = tempfile.TemporaryDirectory()
+        self.addCleanup(self.work.cleanup)
+        self.home = Path(self.work.name)
+        self.env = {**os.environ, "HOME": str(self.home), "CLAUDE_MULTIACC_PYTHON": "python3"}
+        for provider, _, _ in PROVIDERS:
+            (self.home / f".{provider}").mkdir()
+            self.env[f"{provider.upper()}_ACCOUNTS_ROOT"] = str(self.home / f".{provider}-accounts")
+
+    def seed(self, provider, directory=None):
+        account = directory or self.home / f".{provider}-accounts" / "acct-01"
+        subprocess.run(
+            ["bash", "-c", '. "$1"; seed_account_dir "$2"', "seed", str(REPO / "lib/common.sh"), str(account)],
+            env={**self.env, "MULTIACC_PROVIDER": provider}, check=True, capture_output=True, text=True,
+        )
+        return account
+
+    def test_instructions_are_shared_and_updates_remain_visible(self):
+        for provider, name, _ in PROVIDERS:
+            with self.subTest(provider=provider):
+                source = self.home / f".{provider}" / name
+                source.write_text("Global preferences\n")
+                account = self.seed(provider)
+                self.assertTrue((account / name).is_symlink())
+                self.assertEqual((account / name).resolve(), source.resolve())
+                source.write_text("Updated preferences\n")
+                self.seed(provider)
+                self.assertEqual((account / name).read_text(), "Updated preferences\n")
+
+    def test_existing_files_and_links_are_preserved(self):
+        for provider, name, _ in PROVIDERS:
+            with self.subTest(provider=provider):
+                (self.home / f".{provider}" / name).write_text("Global preferences\n")
+                account = self.seed(provider)
+                target = account / name
+                target.unlink()
+                target.write_text("Account preferences\n")
+                self.seed(provider)
+                self.assertFalse(target.is_symlink())
+                self.assertEqual(target.read_text(), "Account preferences\n")
+                target.unlink()
+                local = self.home / f"{provider}-local.md"
+                target.symlink_to(local)
+                self.seed(provider)
+                self.assertEqual(target.readlink(), local)  # Dangling custom link is also owned by the user.
+                local.write_text("Custom preferences\n")
+                self.seed(provider)
+                self.assertEqual(target.read_text(), "Custom preferences\n")
+
+    def test_missing_global_file_never_creates_a_dangling_or_self_link(self):
+        for provider, name, _ in PROVIDERS:
+            with self.subTest(provider=provider):
+                account = self.seed(provider)
+                self.assertFalse(os.path.lexists(account / name))
+                base = self.home / f".{provider}"
+                self.seed(provider, base)
+                self.assertFalse(os.path.lexists(base / name))
+                (base / name).write_text("Global preferences\n")
+                self.seed(provider, base)
+                self.assertFalse((base / name).is_symlink())
+
+    def test_existing_settings_and_model_are_not_overwritten(self):
+        for provider, _, name in PROVIDERS:
+            with self.subTest(provider=provider):
+                source = self.home / f".{provider}" / name
+                source.write_text('{"model":"global"}\n' if provider == "claude" else 'model = "global"\n')
+                account = self.seed(provider)
+                self.assertEqual((account / name).read_bytes(), source.read_bytes())
+                original = '{"model":"account"}\n' if provider == "claude" else 'model = "account"\n'
+                (account / name).write_text(original)
+                self.seed(provider)
+                self.assertEqual((account / name).read_text(), original)
+
+    def test_local_sync_repairs_only_manifest_accounts(self):
+        for provider, name, _ in PROVIDERS:
+            with self.subTest(provider=provider):
+                (self.home / f".{provider}" / name).write_text("Global preferences\n")
+                root = self.home / f".{provider}-accounts"
+                (root / "acct-01").mkdir(parents=True)
+                (root / "acct-99").mkdir()
+                (root / "accounts.json").write_text(json.dumps({
+                    "version": 1, "server": "none",
+                    "accounts": [{"id": "acct-01", "email": "fixture@example.test", "home": "mac"}],
+                }))
+                for _ in range(2):
+                    result = subprocess.run(
+                        [str(REPO / "bin" / f"{provider}-accounts"), "sync", "--no-server"],
+                        env=self.env, check=True, capture_output=True, text=True,
+                    )
+                    self.assertIn("nothing pushed", result.stdout)
+                self.assertTrue((root / "acct-01" / name).is_symlink())
+                self.assertFalse(os.path.lexists(root / "acct-99" / name))
+
+
+if __name__ == "__main__":
+    unittest.main()