code-context-control 2.28.3__py3-none-any.whl → 2.29.0__py3-none-any.whl

cli/c3.py

@@ -827,6 +827,11 @@ def cmd_init(args):
     if not c3_dir.exists() or not (c3_dir / "config.json").exists():
         print_header(f"Initializing C3 for: {project_path}")
         _do_init(project_path, ide_name=requested_ide)
+        try:
+            from services.project_manager import ProjectManager
+            ProjectManager().add_project(project_path)
+        except Exception as _e:
+            print(f"  [warn] Could not register project with hub: {_e}")
         if getattr(args, "force", False):
             if git_requested:
                 _init_local_git_repo(project_path)

cli/hub.html

@@ -995,6 +995,49 @@
   </div>
 </div>
 
+<!-- Merge Modal -->
+<div class="modal-backdrop hidden" id="merge-modal">
+  <div class="modal">
+    <div class="modal-header">
+      <h3>Merge Projects</h3>
+      <button class="modal-close" onclick="closeModal('merge-modal')">×</button>
+    </div>
+    <div class="modal-body">
+      <div class="form-group">
+        <span class="form-label">Merging from</span>
+        <div class="form-path" id="merge-modal-source-path"></div>
+      </div>
+      <div class="form-group">
+        <label class="form-label" for="merge-target-select">Merge into</label>
+        <select class="form-input" id="merge-target-select"></select>
+      </div>
+      <div class="form-group">
+        <span class="form-label">After merge</span>
+        <div style="display:flex;flex-direction:column;gap:.4rem;margin-top:.3rem;">
+          <label style="display:flex;align-items:center;gap:.5rem;font-weight:normal;cursor:pointer;">
+            <input type="radio" name="merge-cleanup" value="keep" checked onchange="updateMergeWarning()">
+            <span>Keep source project intact</span>
+          </label>
+          <label style="display:flex;align-items:center;gap:.5rem;font-weight:normal;cursor:pointer;">
+            <input type="radio" name="merge-cleanup" value="clear" onchange="updateMergeWarning()">
+            <span>Clear source (wipe .c3/, MCP configs &amp; instruction docs)</span>
+          </label>
+        </div>
+      </div>
+      <div id="merge-warning" style="display:none;border:1px solid #b13c3c;background:rgba(177,60,60,.1);padding:.6rem .75rem;border-radius:4px;margin-top:.5rem;color:var(--text);font-size:.85rem;">
+        ⚠ The source project's <code>.c3/</code> directory, MCP configs (<code>.mcp.json</code>, <code>.claude/settings.local.json</code>, <code>.codex/</code>) and instruction docs (CLAUDE.md, GEMINI.md, AGENTS.md) will be deleted. The source directory itself stays in place.
+      </div>
+      <p style="font-size:.8rem;color:var(--text-muted);margin-top:.5rem;">
+        Combines memory facts, conversation sessions, and edit-ledger entries into the target. File-memory and indices are not merged.
+      </p>
+    </div>
+    <div class="modal-footer">
+      <button class="btn btn-ghost" onclick="closeModal('merge-modal')">Cancel</button>
+      <button class="btn btn-primary" id="merge-save-btn" onclick="saveMerge()">Merge</button>
+    </div>
+  </div>
+</div>
+
 <!-- Settings Modal -->
 <div class="modal-backdrop hidden" id="settings-modal">
   <div class="modal">
@@ -1186,6 +1229,8 @@ let sessionPollTimer = null;
 let modalPath = null;
 let editPath  = null;
 let transferPath = null;
+let mergeSourcePath = null;
+let mergeSourceName = '';
 let idePath     = null;
 let ideSelected = null;
 let mcpModalPath = null;
@@ -1261,7 +1306,7 @@ document.addEventListener('DOMContentLoaded', async () => {
   );
   document.addEventListener('keydown', e => {
     if (e.key === 'Escape') {
-      ['mcp-modal','edit-modal','transfer-modal','settings-modal','update-modal','batch-update-modal','ide-modal','c3-setup-modal'].forEach(id => {
+      ['mcp-modal','edit-modal','transfer-modal','merge-modal','settings-modal','update-modal','batch-update-modal','ide-modal','c3-setup-modal'].forEach(id => {
         if (!document.getElementById(id).classList.contains('hidden')) closeModal(id);
       });
     }
@@ -1712,6 +1757,7 @@ function projectCard(p) {
   const editBtn     = `<button class="btn btn-xs btn-ghost"  onclick="openEditModal('${jsq(p.path)}','${jsq(p.name)}','${jsq((p.tags||[]).join(','))}')">✏ Edit</button>`;
   const ideBtn      = `<button class="btn btn-xs btn-primary" onclick="openIdeModal('${jsq(p.path)}','${jsq(p.ide)}')">&#9654; IDE</button>`;
   const transferBtn = !active ? `<button class="btn btn-xs btn-ghost"  onclick="openTransferModal('${jsq(p.path)}','${jsq(p.name)}')">Transfer</button>` : '';
+  const mergeBtn    = !active ? `<button class="btn btn-xs btn-ghost"  onclick="openMergeModal('${jsq(p.path)}','${jsq(p.name)}')" title="Merge memory, sessions and edit ledger into another project">⇄ Merge</button>` : '';
   const removeBtn   = !active ? `<button class="btn btn-xs btn-danger"  onclick="removeProject('${jsq(p.path)}','${jsq(p.name)}')">✕ Remove</button>` : '';
 
   const isLaunching = !active && launchingPaths.has(p.path);
@@ -1741,7 +1787,7 @@ function projectCard(p) {
       ${startBtn}${startUiBtn}${openBtn}${restartBtn}${stopBtn}${autostartBtn}${folderBtn}${logBtn}${ledgerBtn}${setupBtn}${ideBtn}
     </div>
     <div class="card-actions-secondary">
-      ${clearNotifBtn}${editBtn}${transferBtn}${removeBtn}
+      ${clearNotifBtn}${editBtn}${transferBtn}${mergeBtn}${removeBtn}
     </div>
   </div>
 </div>`;
@@ -2977,6 +3023,84 @@ async function saveTransfer() {
   }
 }
 
+// ── Merge Modal ───────────────────────────────────────────────────────────
+
+function openMergeModal(path, name) {
+  mergeSourcePath = path;
+  mergeSourceName = name;
+  document.getElementById('merge-modal-source-path').textContent = `${name}  (${path})`;
+  // Populate target dropdown with idle projects (exclude source and active sessions).
+  const sel = document.getElementById('merge-target-select');
+  sel.innerHTML = '';
+  const candidates = (allProjects || []).filter(p => p.path !== path && !p.session_active && p.port == null);
+  if (!candidates.length) {
+    const opt = document.createElement('option');
+    opt.value = '';
+    opt.textContent = '— No eligible target projects —';
+    sel.appendChild(opt);
+    document.getElementById('merge-save-btn').disabled = true;
+  } else {
+    candidates.forEach(p => {
+      const opt = document.createElement('option');
+      opt.value = p.path;
+      opt.textContent = `${p.name}  (${p.path})`;
+      sel.appendChild(opt);
+    });
+    document.getElementById('merge-save-btn').disabled = false;
+  }
+  // Reset cleanup radio + warning
+  document.querySelectorAll('input[name="merge-cleanup"]').forEach(r => { r.checked = (r.value === 'keep'); });
+  updateMergeWarning();
+  openModal('merge-modal');
+}
+
+function updateMergeWarning() {
+  const cleanup = (document.querySelector('input[name="merge-cleanup"]:checked') || {}).value || 'keep';
+  document.getElementById('merge-warning').style.display = cleanup === 'clear' ? 'block' : 'none';
+}
+
+async function saveMerge() {
+  if (!mergeSourcePath) return;
+  const target = document.getElementById('merge-target-select').value;
+  if (!target) { toast('Pick a target project', 'err'); return; }
+  const cleanup = (document.querySelector('input[name="merge-cleanup"]:checked') || {}).value || 'keep';
+  if (cleanup === 'clear') {
+    const ok = await confirmDialog({
+      title: 'Clear source after merge?',
+      message: `This will permanently delete .c3/, MCP configs and instruction docs from "${mergeSourceName}". The merged data will live on inside the target. Continue?`,
+      confirmText: 'Merge & clear',
+      danger: true,
+    });
+    if (!ok) return;
+  }
+  const btn = document.getElementById('merge-save-btn');
+  btn.disabled = true;
+  try {
+    const r = await fetch('/api/projects/merge', {
+      method: 'POST',
+      headers: {'Content-Type':'application/json'},
+      body: JSON.stringify({source_path: mergeSourcePath, target_path: target, cleanup}),
+    });
+    const d = await r.json();
+    if (d.error) throw new Error(d.error);
+    if (!d.merged) throw new Error('Merge did not complete');
+    const s = d.stats || {};
+    const summary = `Merged ${s.facts||0} facts, ${s.sessions||0} sessions, ${s.ledger_entries||0} ledger entries`;
+    toast(summary + (cleanup === 'clear' ? ' — source cleared' : ''), 'ok');
+    if (d.warnings && d.warnings.length) {
+      console.warn('merge warnings:', d.warnings);
+    }
+    closeModal('merge-modal');
+    delete detailsCache[mergeSourcePath];
+    delete detailsCache[target];
+    loadProjects();
+  } catch(e) {
+    toast('Merge error: ' + e.message, 'err');
+  } finally {
+    btn.disabled = false;
+  }
+}
+
 // ── Settings Modal ─────────────────────────────────────────────────────────
 async function openSettings() {
   try {
@@ -3166,11 +3290,12 @@ function closeModal(id) {
   if (id === 'update-modal') { modalPath = null; }
   if (id === 'edit-modal') { editPath = null; }
   if (id === 'transfer-modal') { transferPath = null; }
+  if (id === 'merge-modal') { mergeSourcePath = null; mergeSourceName = ''; }
   if (id === 'c3-setup-modal') { c3SetupPath = null; }
 }
 
 // Close modals on backdrop click
-['mcp-modal','edit-modal','transfer-modal','settings-modal','update-modal','batch-update-modal','ide-modal','c3-setup-modal'].forEach(id => {
+['mcp-modal','edit-modal','transfer-modal','merge-modal','settings-modal','update-modal','batch-update-modal','ide-modal','c3-setup-modal'].forEach(id => {
   document.getElementById(id).addEventListener('click', e => {
     if (e.target === e.currentTarget) closeModal(id);
   });

cli/hub_server.py

@@ -699,6 +699,29 @@ def api_projects_transfer():
         return jsonify({"error": str(e)}), 500
 
 
+@app.route("/api/projects/merge", methods=["POST"])
+def api_projects_merge():
+    """Merge source project's memory/sessions/ledger into target.
+
+    Body: {source_path, target_path, cleanup: 'keep'|'clear'}
+    """
+    data = request.get_json(force=True) or {}
+    src = (data.get("source_path") or "").strip()
+    tgt = (data.get("target_path") or "").strip()
+    cleanup = (data.get("cleanup") or "keep").strip().lower()
+    if not src or not tgt:
+        return jsonify({"error": "source_path and target_path are required"}), 400
+    if cleanup not in ("keep", "clear"):
+        return jsonify({"error": "cleanup must be 'keep' or 'clear'"}), 400
+    try:
+        result = _pm().merge_projects(src, tgt, cleanup=cleanup)
+        if result.get("error"):
+            return jsonify(result), 400
+        return jsonify(result)
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+
+
 @app.route("/api/projects/details", methods=["POST"])
 def api_projects_details():
     data = request.get_json(force=True) or {}

{code_context_control-2.28.3.dist-info → code_context_control-2.29.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-context-control
-Version: 2.28.3
+Version: 2.29.0
 Summary: Local code-intelligence layer for AI coding tools (Claude Code, Codex, Gemini, Copilot). Retrieve less, read less, edit safer.
 Author-email: Dimitri Tselenchuk <dtselenc@gmail.com>
 License-Expression: Apache-2.0

{code_context_control-2.28.3.dist-info → code_context_control-2.29.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cli/__init__.py,sha256=ec66drCZGNMRU4V6ov0zVhYZph1us12Vn8OvG_LJyRY,22
 cli/_hook_utils.py,sha256=1_hTA-Wz62xB8jnSAH4C5TfCkrwEP0g2kq_-oRfQLm4,3724
-cli/c3.py,sha256=9iZCyg3HNadWFSoHjm9oTWIfIKAlSkVJH0FnzIR_xs0,278815
+cli/c3.py,sha256=2tgG0qDN6DF0xPt298c3y_DiHV4jvg93rAkdI2QjHCQ,279052
 cli/docs.html,sha256=qlkXoSfnh8yz78LpkrhzsjTieZJuStlzdo9bktkyQSg,140621
 cli/edits.html,sha256=UjAhoCmBmQ89cklGvJqzC6eyNP2tc8H6T-e01DVkLvE,43418
 cli/hook_auto_snapshot.py,sha256=amtliVDzKUQr6KBR0pdBA8vXghAV-gKr19jBaJVnP_w,5006
@@ -14,8 +14,8 @@ cli/hook_pretool_enforce.py,sha256=Mo9b6SyjlCuwPnkbNSX0RDfNkmt5u_YeEfdY9Q79RKc,1
 cli/hook_read.py,sha256=M5l_SU899O72tZe3j4YQJJKNb1-xulvKOj8XZjJzwYU,8021
 cli/hook_session_stats.py,sha256=a1OKi9kmiXRI2qieY_Uq14xRxdXQTQu9WVzDTUlI0GQ,1897
 cli/hook_terse_advisor.py,sha256=pD7Bap7OYOKqtYz7cX8nWSRLH7ook-tSD2Ov2MNp_sA,5907
-cli/hub.html,sha256=RkTS91KrlY7XsDpdp-CmVQe6JbeRrCv4FXqWrLvqKas,177884
-cli/hub_server.py,sha256=gPyYH7WBt_oVLCqFhNf_GBpzBmR1IohLvf82w_ze8bY,61076
+cli/hub.html,sha256=Hl-XPZGT1mMiKrbX9c5OsEw6mXEumwIB3vp1WlWaplM,183966
+cli/hub_server.py,sha256=gnUJdCgX5ZKZHwLKLYW5ki-P_9HH9Zyi_Hb_yoSKwSI,61979
 cli/mcp_proxy.py,sha256=92htuT-p0j-cDTbyqlIJpGoQ85_Aw7UuB8L_Toi_u20,17511
 cli/mcp_server.py,sha256=DsAPun5WIAmMkn9LISU9HMTCbJJGRaDXCCyRLbI0NP4,28286
 cli/server.py,sha256=Or1emfUbBslscikFqfZ1-w8CRYfTdCSKJJshhBHfD3w,109665
@@ -54,7 +54,7 @@ cli/ui/components/memory.js,sha256=v5IsHTxLHpXX4xCsUaZ_UPprZEabdgP4jiWc298iV2U,2
 cli/ui/components/sessions.js,sha256=FIKtil76B8tCkAmcFV7hlj6GQ_DCJK2jCzvEmdK7NBE,30837
 cli/ui/components/settings.js,sha256=8LVTV2TQl9tcRXhXbtBEJOCBdiyk-x2QASoVYZUAuEA,71442
 cli/ui/components/sidebar.js,sha256=cAY_jwYB-o1X_wWn__VXlG4IegVObuE3NmVsuFWqxtg,7417
-code_context_control-2.28.3.dist-info/licenses/LICENSE,sha256=l8Kh5QCNWNvR6kIt8L0BUZvc2LAFiHv2c-FnsGnUZf4,11301
+code_context_control-2.29.0.dist-info/licenses/LICENSE,sha256=l8Kh5QCNWNvR6kIt8L0BUZvc2LAFiHv2c-FnsGnUZf4,11301
 core/__init__.py,sha256=TSDCEcM4V7gcZVM3w2ykJaqEUch4Dkon-rivV17T73s,2501
 core/config.py,sha256=4zrJtooWn78JQMsuMWabfh7mCithCCQzVfRsHI7TMsQ,11768
 core/ide.py,sha256=9LzsDVK2LL8RVpL40l6oNGiasZ3D8OCU_9i9A0gJKBo,6876
@@ -105,7 +105,7 @@ services/notifications.py,sha256=pyESc6vgV_bBQPppcR4TcjmoHsqIaFTU_J1bvjJbx5Q,865
 services/ollama_client.py,sha256=UiC5Abca622-ac-4goCkAjwo7iUye9g9JGFMN6Ea08M,7983
 services/output_filter.py,sha256=097HPxy0BM8fXePktb7sOf-Yfkx4qqHy0HurNRjhNDY,18635
 services/parser.py,sha256=vv3B4Di1q4Sr2QFAxvsk5tsYNVcAEw8oAQMhXjLURDE,54011
-services/project_manager.py,sha256=-qJGY1NwXsLYC6C9jQ471BLZq9HDMPX2gXddeKC15bU,23573
+services/project_manager.py,sha256=zHT4Ll9fSD09M1v-PpeoVO0G0DueCm2lbtVc3GlxbjA,35304
 services/protocol.py,sha256=gfvk4y-bEwGlXlOwBoyqKuADXe42NAKfdWl3BAzyVJc,11962
 services/proxy_state.py,sha256=u5rd0k6CrOsywZA8FpRu_hMLwhR0TAJhZjy5MdWbCGc,6107
 services/retrieval_broker.py,sha256=9X67VZ_6AkbAzopHuuMFKmP4CGZLnW576kjSKMenBnw,5261
@@ -143,8 +143,8 @@ tui/screens/search_view.py,sha256=MMHjVdlk3HZSuDBSvq8IGrqv_Mh5Us6YqXQ80bcWSMk,19
 tui/screens/session_view.py,sha256=eZ1eDwHTvPOck1wCCviixtOaCxIkBT_95ytNNNriGNA,5991
 tui/screens/stats.py,sha256=p81PjzdaIv7hllb8f45-rlVe4lJZwSdIMqu7e86_u5s,6223
 tui/screens/ui_view.py,sha256=1QJCgLh2YfgWIpvzRG1KOGXYEaOYX6ojN61Azjf2oX0,2125
-code_context_control-2.28.3.dist-info/METADATA,sha256=99UO9rQeMyMix69JHMbMSWCA8babojNUze1jiblmGUw,16096
-code_context_control-2.28.3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-code_context_control-2.28.3.dist-info/entry_points.txt,sha256=7kX_WUsDCF2hbXzvbNyscyaBb9AeA-DJY5v_5hN0DlU,93
-code_context_control-2.28.3.dist-info/top_level.txt,sha256=wRt41zBybVF3qAiNXHz9BURbkKvUvfhmWWtKMhaw6eE,29
-code_context_control-2.28.3.dist-info/RECORD,,
+code_context_control-2.29.0.dist-info/METADATA,sha256=aosiSsHji1aTcG5hPfeRJv0_S6DfyUwFhO-kNIeo53Y,16096
+code_context_control-2.29.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+code_context_control-2.29.0.dist-info/entry_points.txt,sha256=7kX_WUsDCF2hbXzvbNyscyaBb9AeA-DJY5v_5hN0DlU,93
+code_context_control-2.29.0.dist-info/top_level.txt,sha256=wRt41zBybVF3qAiNXHz9BURbkKvUvfhmWWtKMhaw6eE,29
+code_context_control-2.29.0.dist-info/RECORD,,

services/project_manager.py

@@ -577,3 +577,247 @@ class ProjectManager:
 
         self._write_projects(projects)
         return {"transferred": True, "old_path": old_path, "new_path": new_path}
+
+    def merge_projects(self, source_path: str, target_path: str, cleanup: str = "keep") -> dict:
+        """Merge source project's memory/sessions/ledger into target.
+
+        Combines facts (.c3/facts/facts.json), edit-ledger entries
+        (.c3/edit_ledger.jsonl), conversation sessions (.c3/conversations/),
+        and unions registry tags + appends notes. Skips file_memory and
+        indices because their paths reference source files that don't
+        exist in the target.
+
+        Args:
+            source_path: project being merged FROM.
+            target_path: project being merged INTO.
+            cleanup: "keep" leaves source untouched after the merge;
+                     "clear" wipes source's .c3/, MCP configs and
+                     instruction docs (equivalent to ``c3 init --clear``)
+                     and removes its registry entry.
+
+        Returns:
+            ``{"merged": True, "source", "target", "cleanup", "stats": {...}}``
+            on success or ``{"merged": False, "error": "..."}`` on validation
+            failure.
+        """
+        import shutil
+        import uuid
+
+        if cleanup not in ("keep", "clear"):
+            return {"merged": False, "error": "cleanup must be 'keep' or 'clear'"}
+
+        src = Path(source_path).resolve()
+        tgt = Path(target_path).resolve()
+
+        if str(src) == str(tgt):
+            return {"merged": False, "error": "Paths are identical"}
+        if not src.is_dir():
+            return {"merged": False, "error": "Source path does not exist"}
+        if not tgt.is_dir():
+            return {"merged": False, "error": "Target path does not exist"}
+        if not (src / ".c3").is_dir():
+            return {"merged": False, "error": "Source has no .c3 directory"}
+        if not (tgt / ".c3").is_dir():
+            return {"merged": False, "error": "Target has no .c3 directory"}
+
+        projects = self._read_projects()
+        src_entry = next((p for p in projects if p.get("path") == str(src)), None)
+        tgt_entry = next((p for p in projects if p.get("path") == str(tgt)), None)
+        if src_entry is None:
+            return {"merged": False, "error": "Source project not registered"}
+        if tgt_entry is None:
+            return {"merged": False, "error": "Target project not registered"}
+
+        src_name = src_entry.get("name") or src.name
+        slug = "".join(c if c.isalnum() else "_" for c in src_name.lower())[:32] or "merged"
+        merge_tag = f"merged:{slug}"
+        merged_at = datetime.utcnow().isoformat() + "Z"
+
+        stats = {"facts": 0, "ledger_entries": 0, "sessions": 0}
+        warnings: list[str] = []
+
+        # ── Facts ────────────────────────────────────────────────────
+        src_facts_file = src / ".c3" / "facts" / "facts.json"
+        tgt_facts_dir = tgt / ".c3" / "facts"
+        tgt_facts_file = tgt_facts_dir / "facts.json"
+
+        if src_facts_file.exists():
+            try:
+                with open(src_facts_file, encoding="utf-8") as f:
+                    src_facts = json.load(f) or []
+            except Exception as e:
+                src_facts = []
+                warnings.append(f"facts read failed: {e}")
+
+            if src_facts:
+                tgt_facts: list = []
+                if tgt_facts_file.exists():
+                    try:
+                        with open(tgt_facts_file, encoding="utf-8") as f:
+                            tgt_facts = json.load(f) or []
+                    except Exception as e:
+                        warnings.append(f"target facts read failed: {e}")
+                        tgt_facts = []
+                for fact in src_facts:
+                    if not isinstance(fact, dict):
+                        continue
+                    new_fact = dict(fact)
+                    new_id = uuid.uuid4().hex[:12]
+                    new_fact["id"] = new_id
+                    new_fact["vector_id"] = new_id
+                    new_fact["merged_from"] = src_name
+                    new_fact["merged_at"] = merged_at
+                    tgt_facts.append(new_fact)
+                    stats["facts"] += 1
+                tgt_facts_dir.mkdir(parents=True, exist_ok=True)
+                with open(tgt_facts_file, "w", encoding="utf-8") as f:
+                    json.dump(tgt_facts, f, indent=2)
+
+        # ── Edit ledger ──────────────────────────────────────────────
+        src_ledger = src / ".c3" / "edit_ledger.jsonl"
+        tgt_ledger = tgt / ".c3" / "edit_ledger.jsonl"
+        if src_ledger.exists():
+            tgt_ledger.parent.mkdir(parents=True, exist_ok=True)
+            try:
+                with open(tgt_ledger, "a", encoding="utf-8") as out:
+                    for line in src_ledger.read_text(encoding="utf-8").splitlines():
+                        if not line.strip():
+                            continue
+                        try:
+                            entry = json.loads(line)
+                        except Exception:
+                            continue
+                        summary = entry.get("summary") or ""
+                        entry["summary"] = f"[merged from {src_name}] {summary}".rstrip()
+                        tags = list(entry.get("tags") or [])
+                        if merge_tag not in tags:
+                            tags.append(merge_tag)
+                        entry["tags"] = tags
+                        entry["merged_from"] = src_name
+                        out.write(json.dumps(entry) + "\n")
+                        stats["ledger_entries"] += 1
+            except Exception as e:
+                warnings.append(f"ledger merge failed: {e}")
+
+        # ── Conversations ────────────────────────────────────────────
+        src_conv = src / ".c3" / "conversations"
+        tgt_conv = tgt / ".c3" / "conversations"
+        if src_conv.is_dir():
+            tgt_conv.mkdir(parents=True, exist_ok=True)
+            renamed: dict[str, str] = {}  # old_id -> new_id
+
+            # Load target sessions index up-front so we know what IDs collide.
+            tgt_sessions: list = []
+            tgt_sessions_file = tgt_conv / "sessions.json"
+            if tgt_sessions_file.exists():
+                try:
+                    with open(tgt_sessions_file, encoding="utf-8") as f:
+                        tgt_sessions = json.load(f) or []
+                except Exception as e:
+                    warnings.append(f"target sessions read failed: {e}")
+                    tgt_sessions = []
+            tgt_ids = {s.get("session_id") for s in tgt_sessions if s.get("session_id")}
+
+            # Copy turn files (rename on collision).
+            for entry_path in src_conv.iterdir():
+                if not entry_path.is_file():
+                    continue
+                if entry_path.name == "sessions.json":
+                    continue
+                if entry_path.name.endswith(".jsonl.gz"):
+                    base = entry_path.name[:-len(".jsonl.gz")]
+                    ext = ".jsonl.gz"
+                elif entry_path.suffix == ".jsonl":
+                    base = entry_path.stem
+                    ext = ".jsonl"
+                else:
+                    continue
+                new_base = base
+                if base in tgt_ids or (tgt_conv / (base + ext)).exists():
+                    new_base = f"{base}_merged_{uuid.uuid4().hex[:6]}"
+                    renamed[base] = new_base
+                try:
+                    shutil.copy2(entry_path, tgt_conv / (new_base + ext))
+                except Exception as e:
+                    warnings.append(f"session copy {entry_path.name} failed: {e}")
+
+            # Merge sessions index.
+            src_sessions_file = src_conv / "sessions.json"
+            if src_sessions_file.exists():
+                try:
+                    with open(src_sessions_file, encoding="utf-8") as f:
+                        src_sessions = json.load(f) or []
+                except Exception as e:
+                    src_sessions = []
+                    warnings.append(f"source sessions read failed: {e}")
+                for s in src_sessions:
+                    if not isinstance(s, dict):
+                        continue
+                    new_s = dict(s)
+                    sid = new_s.get("session_id", "")
+                    if sid in renamed:
+                        new_s["session_id"] = renamed[sid]
+                    elif sid and sid in tgt_ids:
+                        new_s["session_id"] = f"{sid}_merged_{uuid.uuid4().hex[:6]}"
+                    new_s["merged_from"] = src_name
+                    new_s["merged_at"] = merged_at
+                    tgt_sessions.append(new_s)
+                    stats["sessions"] += 1
+                with open(tgt_sessions_file, "w", encoding="utf-8") as f:
+                    json.dump(tgt_sessions, f, ensure_ascii=False, indent=2)
+            else:
+                # No index in source — count copied turn files as sessions.
+                stats["sessions"] = len(list(tgt_conv.iterdir())) - (1 if tgt_sessions_file.exists() else 0)
+
+        # ── Registry tags + notes ────────────────────────────────────
+        for p in projects:
+            if p.get("path") == str(tgt):
+                tags = list(p.get("tags") or [])
+                for t in (src_entry.get("tags") or []):
+                    if t and t not in tags:
+                        tags.append(t)
+                p["tags"] = tags
+                src_notes = (src_entry.get("notes") or "").strip()
+                if src_notes:
+                    tgt_notes = (p.get("notes") or "").strip()
+                    sep = f"--- merged from {src_name} ---"
+                    p["notes"] = f"{tgt_notes}\n\n{sep}\n{src_notes}".strip() if tgt_notes else f"{sep}\n{src_notes}"
+                break
+        self._write_projects(projects)
+
+        # ── Cleanup ──────────────────────────────────────────────────
+        if cleanup == "clear":
+            try:
+                # Lazy import to avoid services -> cli circular import at module load.
+                from cli.c3 import _instruction_documents_for_project, _uninstall_mcp_all
+                try:
+                    _uninstall_mcp_all(str(src))
+                except Exception as e:
+                    warnings.append(f"uninstall_mcp failed: {e}")
+                c3_dir = src / ".c3"
+                if c3_dir.exists():
+                    try:
+                        shutil.rmtree(c3_dir)
+                    except Exception as e:
+                        warnings.append(f"rmtree .c3 failed: {e}")
+                for filename, _ in _instruction_documents_for_project():
+                    doc = src / filename
+                    if doc.exists():
+                        try:
+                            doc.unlink()
+                        except Exception as e:
+                            warnings.append(f"delete {filename} failed: {e}")
+            except Exception as e:
+                warnings.append(f"cleanup helpers unavailable: {e}")
+            self.remove_project(str(src))
+
+        result = {
+            "merged": True,
+            "source": str(src),
+            "target": str(tgt),
+            "cleanup": cleanup,
+            "stats": stats,
+        }
+        if warnings:
+            result["warnings"] = warnings
+        return result