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

cli/c3.py

@@ -60,7 +60,7 @@ from cli.commands.common import cmd_stats as common_cmd_stats
 from cli.commands.common import cmd_ui as common_cmd_ui
 from cli.commands.parser import build_parser
 from core import count_tokens, format_token_count
-from core.config import AGENT_DEFAULTS, DELEGATE_DEFAULTS, PROXY_DEFAULTS, load_delegate_config
+from core.config import AGENT_DEFAULTS, BITBUCKET_DEFAULTS, DELEGATE_DEFAULTS, PROXY_DEFAULTS, load_delegate_config
 from core.config import DEFAULTS as HYBRID_DEFAULTS
 from core.ide import PROFILES, detect_ide, get_profile, load_ide_config, normalize_ide_name
 from services.compressor import CodeCompressor
@@ -85,7 +85,7 @@ console = Console() if HAS_RICH else None
 # Config
 CONFIG_DIR = ".c3"
 CONFIG_FILE = ".c3/config.json"
-__version__ = "2.28.3"
+__version__ = "2.30.0"
 
 
 def _command_deps() -> CommandDeps:
@@ -164,6 +164,7 @@ def _build_init_config(project_path: str) -> dict:
         "proxy": deepcopy(PROXY_DEFAULTS),
         "delegate": deepcopy(DELEGATE_DEFAULTS),
         "agents": deepcopy(AGENT_DEFAULTS),
+        "bitbucket": deepcopy(BITBUCKET_DEFAULTS),
     }
     merged = _deep_merge_dict(defaults, existing if isinstance(existing, dict) else {})
     # Always persist current path/version on init/update.
@@ -237,7 +238,7 @@ _C3_MCP_ALLOW = [
     "mcp__c3__c3_session", "mcp__c3__c3_status", "mcp__c3__c3_filter",
     "mcp__c3__c3_memory", "mcp__c3__c3_validate", "mcp__c3__c3_edit",
     "mcp__c3__c3_agent", "mcp__c3__c3_delegate", "mcp__c3__c3_edits",
-    "mcp__c3__c3_impact", "mcp__c3__c3_shell",
+    "mcp__c3__c3_impact", "mcp__c3__c3_shell", "mcp__c3__c3_bitbucket",
 ]
 
 # Obsolete MCP tool names from earlier C3 versions. `c3 permissions clean`
@@ -563,6 +564,25 @@ def _check_c3_health(project_path: str) -> dict:
     facts_dir = c3_dir / "facts"
     info["facts"] = len(list(facts_dir.glob("*.json"))) if facts_dir.exists() else 0
 
+    # Bitbucket integration (v2.30.0+) — informational
+    bb_section = config.get("bitbucket") if isinstance(config, dict) else None
+    if isinstance(bb_section, dict):
+        active = bb_section.get("active") or {}
+        accounts = bb_section.get("accounts") or []
+        info["bitbucket_accounts"] = len(accounts) if isinstance(accounts, list) else 0
+        info["bitbucket_active_account"] = (
+            f"{active.get('username', '')}@{active.get('base_url', '')}"
+            if active.get("base_url") and active.get("username") else ""
+        )
+        info["bitbucket_default_repo"] = (
+            f"{bb_section.get('default_project', '')}/{bb_section.get('default_repo', '')}"
+            if bb_section.get("default_project") and bb_section.get("default_repo") else ""
+        )
+    else:
+        info["bitbucket_accounts"] = 0
+        info["bitbucket_active_account"] = ""
+        info["bitbucket_default_repo"] = ""
+
     info["issues"] = issues
     info["healthy"] = len(issues) == 0
     return info
@@ -827,6 +847,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)
@@ -941,6 +966,15 @@ def cmd_init(args):
     except Exception:
         print("  Gemini: unknown")
 
+    # Bitbucket integration (v2.30.0+)
+    bb_n = int(health.get("bitbucket_accounts") or 0)
+    if bb_n:
+        active = health.get("bitbucket_active_account") or "(no active)"
+        repo = health.get("bitbucket_default_repo") or "(no default repo)"
+        print(f"  Bitbkt: {bb_n} account(s), active={active}, repo={repo}")
+    else:
+        print("  Bitbkt: not configured (run 'c3 bitbucket login --url <URL>')")
+
     if health["healthy"]:
         print("\n  Status: healthy — no issues detected.")
     else:
@@ -4457,6 +4491,7 @@ back to native tools as the task progresses.
 - **Shell**: `c3_shell(cmd, timeout=60)` — structured shell exec (tests/git/build). Auto-filters output, logs git mutations to the ledger. Native Bash for interactive/TTY only
 - **Memory**: `c3_memory(action='recall')` — full recall. `index` + `fetch` for token-efficient two-step retrieval
 - **Delegate**: `c3_delegate(task, backend='ollama|codex|gemini|claude|auto')` — offload to other models
+- **Bitbucket** (v2.30.0+, when `c3 bitbucket login` has run): `c3_bitbucket(action='list_prs|get_pr|merge_pr|...')` — self-hosted Bitbucket Data Center / Server. Token in OS keyring; mutating actions auto-log to the edit ledger.
 
 ## Self-Check
 If you haven't called a c3_* tool in several turns during active development, re-engage
@@ -5383,6 +5418,144 @@ def cmd_hub(args):
     run_hub(port=port, open_browser=open_browser, silent=silent, quiet=quiet)
 
 
+def cmd_bitbucket(args):
+    """Bitbucket Data Center / Server credential + workspace management."""
+    sub = getattr(args, "bitbucket_cmd", None)
+    if not sub:
+        print("Usage: c3 bitbucket {login,logout,status,use,set-default} [args]")
+        return
+
+    project_path = getattr(args, "project_path", ".") or "."
+
+    if sub == "login":
+        _bb_cmd_login(args, project_path)
+    elif sub == "logout":
+        _bb_cmd_logout(args, project_path)
+    elif sub == "status":
+        _bb_cmd_status(args, project_path)
+    elif sub == "use":
+        _bb_cmd_use(args, project_path)
+    elif sub == "set-default":
+        _bb_cmd_set_default(args, project_path)
+    else:
+        print(f"Unknown bitbucket subcommand: {sub}")
+
+
+def _bb_cmd_login(args, project_path: str) -> None:
+    import getpass
+
+    from services import bitbucket_credentials as bb_creds
+    from services.bitbucket_client import BitbucketDataCenterClient, BitbucketError
+
+    base_url = (args.url or "").rstrip("/")
+    username = args.username or input(f"Username for {base_url}: ").strip()
+    if not username:
+        print("Login cancelled — username required.")
+        return
+    token = args.token or getpass.getpass(f"Personal Access Token for {username}: ").strip()
+    if not token:
+        print("Login cancelled — token required.")
+        return
+
+    try:
+        bb_creds.save_credentials(
+            base_url, username, token,
+            project_path=project_path,
+            set_active=not getattr(args, "no_set_active", False),
+        )
+    except bb_creds.BitbucketCredentialError as exc:
+        print(f"[error] {exc}")
+        return
+
+    if getattr(args, "insecure", False):
+        bb_creds.set_verify_tls(False, project_path=project_path)
+
+    print(f"[OK] Stored credentials for {username}@{base_url}")
+
+    # Connection probe — non-fatal if it fails (token might be valid but
+    # network blocked at this moment).
+    try:
+        client = BitbucketDataCenterClient(
+            base_url=base_url, token=token,
+            verify_tls=not getattr(args, "insecure", False),
+        )
+        props = client.application_properties()
+        version = props.get("version", "?")
+        user = client.whoami()
+        print(f"     Server: {version} ({base_url})")
+        print(f"     Auth as: {user.get('displayName', username)} <{user.get('emailAddress', '?')}>")
+    except BitbucketError as exc:
+        print(f"[warn] Connection probe failed: {exc}")
+        print("       Token saved anyway — re-test with `c3 bitbucket status`.")
+
+
+def _bb_cmd_logout(args, project_path: str) -> None:
+    from services import bitbucket_credentials as bb_creds
+
+    base_url = (getattr(args, "url", "") or "").rstrip("/")
+    username = getattr(args, "username", "") or ""
+    if not base_url or not username:
+        active = bb_creds.get_active_account(project_path)
+        base_url = base_url or active.get("base_url", "")
+        username = username or active.get("username", "")
+    if not base_url or not username:
+        print("[error] No account specified and no active account configured.")
+        return
+    removed = bb_creds.delete_credentials(base_url, username, project_path=project_path)
+    if removed:
+        print(f"[OK] Removed {username}@{base_url}")
+    else:
+        print(f"[warn] Nothing to remove for {username}@{base_url}")
+
+
+def _bb_cmd_status(args, project_path: str) -> None:
+    from core.config import load_bitbucket_config
+    from services import bitbucket_credentials as bb_creds
+    from services.bitbucket_client import BitbucketDataCenterClient, BitbucketError
+
+    cfg = load_bitbucket_config(project_path)
+    active = cfg.get("active") or {}
+    accounts = cfg.get("accounts") or []
+
+    print("[bitbucket:status]")
+    print(f"  Active  : {active.get('username') or '-'}@{active.get('base_url') or '-'}")
+    print(f"  Defaults: project={cfg.get('default_project') or '-'} repo={cfg.get('default_repo') or '-'}")
+    print(f"  Verify TLS: {cfg.get('verify_tls', True)}")
+    print(f"  Accounts ({len(accounts)}):")
+    for a in accounts:
+        marker = "*" if a == active else " "
+        print(f"    {marker} {a.get('username','?')}@{a.get('base_url','?')}")
+
+    if not active.get("base_url") or not active.get("username"):
+        print("  Connection: (no active account)")
+        return
+    token = bb_creds.load_token(active["base_url"], active["username"])
+    if not token:
+        print("  Connection: FAIL — no token in keyring")
+        return
+    try:
+        client = BitbucketDataCenterClient(
+            base_url=active["base_url"], token=token,
+            verify_tls=bool(cfg.get("verify_tls", True)),
+        )
+        props = client.application_properties()
+        print(f"  Connection: OK (version {props.get('version','?')})")
+    except BitbucketError as exc:
+        print(f"  Connection: FAIL — {exc}")
+
+
+def _bb_cmd_use(args, project_path: str) -> None:
+    from services import bitbucket_credentials as bb_creds
+    bb_creds.set_active_account(args.url, args.username, project_path=project_path)
+    print(f"[OK] Active account: {args.username}@{args.url.rstrip('/')}")
+
+
+def _bb_cmd_set_default(args, project_path: str) -> None:
+    from services import bitbucket_credentials as bb_creds
+    bb_creds.set_default_repo(args.project, args.repo, project_path=project_path)
+    print(f"[OK] Default repo: {args.project}/{args.repo}")
+
+
 def cmd_projects(args):
     """Manage the global C3 project registry."""
     from services.project_manager import ProjectManager
@@ -6134,6 +6307,7 @@ def main():
         "ui": cmd_ui,
         "projects": cmd_projects,
         "hub": cmd_hub,
+        "bitbucket": cmd_bitbucket,
     }
 
     cmd_func = commands.get(args.command)

cli/commands/parser.py

@@ -283,4 +283,43 @@ def build_parser(version: str, parse_cli_ide_arg):
     p_bext.add_argument("--dry-run", action="store_true",
         help="Validate setup (CLIs, datasets) without running the agent")
 
+    # ── Bitbucket Data Center / Server (v2.30.0) ─────────────────────────
+    p_bitbucket = subparsers.add_parser(
+        "bitbucket",
+        help="Bitbucket Data Center / Server credential + workspace management",
+    )
+    bb_subs = p_bitbucket.add_subparsers(dest="bitbucket_cmd")
+
+    bb_login = bb_subs.add_parser(
+        "login",
+        help="Authenticate with a Bitbucket Data Center server (interactive PAT prompt)",
+    )
+    bb_login.add_argument("--url", required=True, help="Bitbucket server base URL (e.g. https://bitbucket.example.com)")
+    bb_login.add_argument("--username", help="Bitbucket username (prompted if omitted)")
+    bb_login.add_argument("--token", help="Personal Access Token (prompted via getpass if omitted — preferred)")
+    bb_login.add_argument("--no-set-active", action="store_true", help="Do not switch the active account to this one")
+    bb_login.add_argument("--insecure", action="store_true", help="Disable TLS verification (self-signed certs)")
+    bb_login.add_argument("project_path", nargs="?", default=".")
+
+    bb_logout = bb_subs.add_parser("logout", help="Remove a Bitbucket account from keyring + config")
+    bb_logout.add_argument("--url", help="Bitbucket server base URL (defaults to active account)")
+    bb_logout.add_argument("--username", help="Username to log out (defaults to active account)")
+    bb_logout.add_argument("project_path", nargs="?", default=".")
+
+    bb_status = bb_subs.add_parser("status", help="Show configured Bitbucket accounts and connectivity")
+    bb_status.add_argument("project_path", nargs="?", default=".")
+
+    bb_use = bb_subs.add_parser("use", help="Switch the active Bitbucket account")
+    bb_use.add_argument("--url", required=True)
+    bb_use.add_argument("--username", required=True)
+    bb_use.add_argument("project_path", nargs="?", default=".")
+
+    bb_default = bb_subs.add_parser(
+        "set-default",
+        help="Set the default project key + repo slug for this C3 project",
+    )
+    bb_default.add_argument("--project", required=True, help="Bitbucket project key (e.g. PROJ)")
+    bb_default.add_argument("--repo", required=True, help="Repository slug")
+    bb_default.add_argument("project_path", nargs="?", default=".")
+
     return parser

cli/docs.html

@@ -751,6 +751,7 @@
 
       <div class="sidebar-section">MCP Server</div>
       <a href="#mcp-tools">MCP Tools</a>
+      <a href="#bitbucket-tool">Bitbucket Integration</a>
       <a href="#context-tools">Context Manager</a>
       <a href="#claudemd-tools">Instructions Tools</a>
       <a href="#agent-tools">Background Agents</a>
@@ -1147,7 +1148,7 @@ python cli/c3.py install-mcp . gemini</code></pre>
 
       <!-- ─── MCP Tools ───────────────────── -->
       <h2 id="mcp-tools">MCP Tools Reference</h2>
-      <p>C3 exposes 9 MCP tools. All core tools work without Ollama; delegate requires it.</p>
+      <p>C3 exposes 15 MCP tools. All core tools work without Ollama; delegate requires it. The Bitbucket integration is optional and activated via <code>c3 bitbucket login</code>.</p>
 
       <h3>Discovery &amp; Compression</h3>
       <table>
@@ -1298,6 +1299,41 @@ python cli/c3.py install-mcp . gemini</code></pre>
         View the full timeline at <code>/edits</code>.
       </div>
 
+      <!-- Bitbucket Integration (v2.30.0) -->
+      <h2 id="bitbucket-tool">Bitbucket Data Center / Server</h2>
+      <p>C3 v2.30.0 ships a dedicated <code>c3_bitbucket</code> tool for self-hosted enterprise Bitbucket. It supports read browsing (PRs, branches, builds, activity), PR write actions (create / comment / approve / decline / merge), branch writes, and repository administration (settings, webhooks, permissions). PATs are stored in the OS keyring — never in <code>.c3/config.json</code>.</p>
+
+      <table>
+        <tr><th>Surface</th><th>What it provides</th></tr>
+        <tr><td><code>c3_bitbucket</code> MCP tool</td><td>Action-dispatched Bitbucket calls from Claude Code (27 actions across read / PR-write / branch / admin)</td></tr>
+        <tr><td><code>c3 bitbucket {login,logout,status,use,set-default}</code></td><td>CLI for credential and default-repo management. Login uses <code>getpass</code> for masked PAT entry.</td></tr>
+        <tr><td>Hub UI Bitbucket tab</td><td>Per-project visual browser: Overview, Pull Requests, Branches, Activity, Admin</td></tr>
+        <tr><td><code>/api/bitbucket/*</code> REST endpoints</td><td>Project session-server endpoints proxying to <code>BitbucketDataCenterClient</code></td></tr>
+      </table>
+
+      <div class="tip">
+        <div class="tip-title">Where the token lives</div>
+        Tokens are stored exclusively in the <strong>OS keyring</strong> (Windows Credential Manager / macOS Keychain / Linux Secret Service) under service <code>c3-bitbucket</code>. Only a non-secret index of <code>(base_url, username)</code> pairs and the active-account pointer is written to <code>.c3/config.json</code>. <code>.c3/</code> is gitignored.
+      </div>
+
+      <p><strong>Quick start</strong></p>
+      <pre><code>c3 bitbucket login --url https://bitbucket.example.com
+c3 bitbucket set-default --project PROJ --repo my-service
+c3 bitbucket status</code></pre>
+
+      <p>From Claude Code:</p>
+      <pre><code>c3_bitbucket(action='list_prs', state='OPEN')
+c3_bitbucket(action='get_pr', pr_id=42)
+c3_bitbucket(action='approve_pr', pr_id=42)
+c3_bitbucket(action='merge_pr', pr_id=42)  # version auto-fetched</code></pre>
+
+      <div class="tip">
+        <div class="tip-title">Audit trail</div>
+        PR merges, branch deletes, webhook writes, and other mutating actions are appended to the C3 edit ledger under the virtual path <code>bitbucket://&lt;project&gt;/&lt;repo&gt;</code> so the local audit trail covers platform-side state changes too. Token text is stripped from logged kwargs before persisting.
+      </div>
+
+      <p>Full reference (action tables, security model, configuration shape, examples, troubleshooting): <a href="/guide/bitbucket.html">Bitbucket integration guide</a>. Currently <strong>Bitbucket Cloud</strong> (<code>bitbucket.org</code>) is not supported — only Data Center / Server.</p>
+
       <h3 id="agent-tools">Background Agents</h3>
       <p>C3 runs 9 autonomous daemon threads that perform periodic analysis and surface findings via a notification
         queue. Notifications are automatically prepended to the next MCP tool response so Claude sees them naturally.

cli/hook_ghost_files.py

@@ -35,6 +35,16 @@ _PYTHON_TYPE_NAMES = {
     "Awaitable", "Coroutine", "AsyncIterator", "AsyncGenerator",
 }
 
+# Common heredoc / here-string end-markers that leak as filenames when
+# Bash or PowerShell misparses a `<<EOF` / `@'...'@` block. Match is
+# size-agnostic: a non-empty `EOF` file is still a ghost.
+_HEREDOC_MARKERS = {
+    "EOF", "EOM", "EOL", "END", "STOP", "DONE",
+    "MARK", "MARKER", "DELIM", "DELIMITER",
+    "INPUT", "OUTPUT", "DATA", "BLOCK", "HEREDOC",
+    "'@", "@'",  # PowerShell here-string fragments
+}
+
 # Max file size to consider a ghost (bytes). Genuine files are usually larger.
 _MAX_GHOST_SIZE = 4096
 
@@ -108,6 +118,10 @@ def _is_ghost_file(path: Path) -> bool:
     if name in _PYTHON_TYPE_NAMES:
         return True
 
+    # HEREDOC end-marker leaked as filename (e.g., "EOF", "'@", "END")
+    if name in _HEREDOC_MARKERS and not real_suffix:
+        return True
+
     # Partial type annotation (e.g., "tuple[float", "dict[str")
     if "[" in name and not real_suffix:
         return True
@@ -154,7 +168,9 @@ def scan_ghost_files(project_root: Path) -> list[dict]:
             name = entry.name
 
             # Determine reason
-            if name in _PYTHON_TYPE_NAMES:
+            if name in _HEREDOC_MARKERS:
+                reason = "heredoc end-marker leak"
+            elif name in _PYTHON_TYPE_NAMES:
                 reason = "Python type name"
             elif "[" in name:
                 reason = "partial type annotation"

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 {}

cli/mcp_server.py

@@ -649,6 +649,56 @@ async def c3_shell(cmd: str, cwd: str = "", timeout: int = 60,
     return await handle_shell(cmd, cwd, timeout, filter_output, log, svc, finalize)
 
 
+@mcp.tool()
+async def c3_bitbucket(
+    action: str,
+    project: str = "",
+    repo: str = "",
+    pr_id: int = 0,
+    branch: str = "",
+    state: str = "OPEN",
+    title: str = "",
+    body: str = "",
+    from_branch: str = "",
+    to_branch: str = "",
+    description: str = "",
+    reviewers: str = "",
+    name: str = "",
+    url: str = "",
+    events: str = "",
+    start_point: str = "",
+    commit: str = "",
+    settings: str = "",
+    webhook_id: int = 0,
+    limit: int = 50,
+    ctx: Context = None,
+) -> str:
+    """BITBUCKET (Data Center / Server) — see and act on PRs, branches, builds, repo admin.
+    actions: status, whoami, list_projects, list_repos, get_repo,
+    list_prs, get_pr, get_pr_diff, get_pr_activities,
+    create_pr, comment_pr, approve_pr, unapprove_pr, decline_pr, merge_pr,
+    list_branches, create_branch, delete_branch,
+    list_commits, list_activity, build_status,
+    repo_settings, update_repo_settings, list_webhooks, create_webhook, delete_webhook,
+    list_permissions.
+    project/repo fall back to bitbucket.default_project/default_repo from .c3/config.json.
+    Tokens live in the OS keyring — `c3 bitbucket login` to set them up first."""
+    svc = _svc(ctx)
+
+    def finalize(fname, fargs, fresp, fsumm, **kw):
+        return _finalize_response(ctx, fname, fargs, fresp, fsumm, **kw)
+
+    from cli.tools.bitbucket import handle_bitbucket
+    return await asyncio.to_thread(
+        handle_bitbucket, action, svc, finalize,
+        project=project, repo=repo, pr_id=pr_id, branch=branch, state=state,
+        title=title, body=body, from_branch=from_branch, to_branch=to_branch,
+        description=description, reviewers=reviewers, name=name, url=url,
+        events=events, start_point=start_point, commit=commit,
+        settings=settings, webhook_id=webhook_id, limit=limit,
+    )
+
+
 def main() -> None:
     """Entry-point for the ``c3-mcp`` console script."""
     from services import error_reporting