cortex-sync 0.4.0 → 0.4.2

package/README.md

@@ -65,6 +65,49 @@ Open any project on Machine B — Claude Code shows your full session history.
 
 ---
 
+## Team context
+
+Share skills, CLAUDE.md, plugins, and chat sessions with your team via a shared GitHub repo.
+
+```bash
+# Tech Lead — one-time setup
+cortex team init --repo https://github.com/your-org/claude-config
+
+# Push your local .claude/ context + sessions (if opted in)
+cortex team push
+
+# Dev — pull team context + sessions
+cortex team pull
+
+# New dev — first-time install
+cortex install --repo https://github.com/your-org/claude-config
+```
+
+### What gets shared
+
+| What | Source | Destination |
+|---|---|---|
+| Skills | `.claude/skills/*.md` | `skills/` in team repo |
+| CLAUDE.md | `.claude/CLAUDE.md` | `CLAUDE.md` in team repo |
+| Plugins | Installed Claude plugins | `cortex.json → plugins[]` |
+| Sessions (opt-in) | `~/.claude/projects/<project>/` | `sessions/<email>/<project-id>/` |
+
+### Session sharing
+
+During `cortex team init` you are asked once whether to share your Claude Code chat sessions with the team. If you accept:
+
+- Sessions are uploaded on every `cortex team push`
+- Teammates get your sessions (paths remapped to their machine) on `cortex team pull`
+- Claude Code shows all team sessions natively — no extra steps
+
+You can choose to encrypt sessions with a shared team passphrase (AES-256-GCM). Share the passphrase with your team via a password manager — it is never stored by cortex.
+
+**Two machines, same GitHub user:** Each machine generates unique session IDs, so pushing from both machines never creates duplicates.
+
+> **Privacy:** Sessions may contain source code, API calls, and sensitive context. Only opt in if your team has a shared understanding that sessions are visible to all members.
+
+---
+
 ## Claude Code MCP integration
 
 Use `sync`, `pull`, `status`, `convert`, and `init` directly from the Claude Code chat — one command does everything:

package/dist/cli.js

@@ -1341,9 +1341,9 @@ Make sure Claude Code CLI is installed and "claude" is in your PATH.`
 }
 
 // src/commands/team/init.ts
-import { input as input3 } from "@inquirer/prompts";
-import { readFile as readFile12, writeFile as writeFile10, mkdir as mkdir10 } from "fs/promises";
-import { join as join15 } from "path";
+import { input as input3, confirm as confirm3, select as select2, password as password5 } from "@inquirer/prompts";
+import { writeFile as writeFile12, mkdir as mkdir11 } from "fs/promises";
+import { join as join17 } from "path";
 
 // src/lib/team-repo.ts
 import { access as access3, mkdir as mkdir8, rm } from "fs/promises";
@@ -1410,10 +1410,9 @@ function commitAndPush(repoUrl, token, message, dir = TEAM_DIR) {
 
 // src/lib/claude-skills.ts
 import { readdir as readdir3, readFile as readFile10, mkdir as mkdir9, writeFile as writeFile9 } from "fs/promises";
-import { homedir as homedir4 } from "os";
 import { join as join13, dirname as dirname7 } from "path";
-var LOCAL_SKILLS_DIR = join13(homedir4(), ".claude", "skills");
-var LOCAL_CLAUDE_MD = join13(homedir4(), ".claude", "CLAUDE.md");
+var LOCAL_SKILLS_DIR = join13(process.cwd(), ".claude", "skills");
+var LOCAL_CLAUDE_MD = join13(process.cwd(), ".claude", "CLAUDE.md");
 async function readSkillsFromDir(dir) {
   const map = /* @__PURE__ */ new Map();
   let entries;
@@ -1448,10 +1447,10 @@ async function writeFileToPath(filePath, content) {
 
 // src/lib/claude-plugins.ts
 import { readFile as readFile11 } from "fs/promises";
-import { homedir as homedir5 } from "os";
+import { homedir as homedir4 } from "os";
 import { join as join14 } from "path";
 import { spawnSync as spawnSync3 } from "child_process";
-var INSTALLED_PLUGINS_PATH = join14(homedir5(), ".claude", "plugins", "installed_plugins.json");
+var INSTALLED_PLUGINS_PATH = join14(homedir4(), ".claude", "plugins", "installed_plugins.json");
 function parseInstalledPlugins(data) {
   return Object.keys(data.plugins);
 }
@@ -1470,6 +1469,124 @@ function installPlugin(pluginId) {
   if (result.status !== 0) throw new Error(`Plugin install failed for ${pluginId}`);
 }
 
+// src/lib/project-config.ts
+import { readFile as readFile12, writeFile as writeFile10 } from "fs/promises";
+import { join as join15 } from "path";
+async function readProjectConfig(cwd = process.cwd()) {
+  try {
+    const content = await readFile12(join15(cwd, "cortex.json"), "utf-8");
+    return JSON.parse(content);
+  } catch {
+    return {};
+  }
+}
+async function writeProjectConfig(updates, cwd = process.cwd()) {
+  const existing = await readProjectConfig(cwd);
+  const merged = { ...existing, ...updates };
+  await writeFile10(join15(cwd, "cortex.json"), JSON.stringify(merged, null, 2), "utf-8");
+}
+
+// src/lib/team-sessions.ts
+import { readdir as readdir4, readFile as readFile13, writeFile as writeFile11, mkdir as mkdir10 } from "fs/promises";
+import { homedir as homedir5 } from "os";
+import { join as join16 } from "path";
+function localSessionsDir(cwd) {
+  return join16(homedir5(), ".claude", "projects", encodeProjectPath(cwd));
+}
+function teamSessionsDir(base, email, projectId) {
+  return join16(base, "sessions", email, projectId);
+}
+async function readSessionFiles(dir) {
+  const result = /* @__PURE__ */ new Map();
+  try {
+    const entries = await readdir4(dir);
+    for (const entry of entries) {
+      if (entry.endsWith(".jsonl")) {
+        result.set(entry, await readFile13(join16(dir, entry)));
+      }
+    }
+  } catch {
+  }
+  return result;
+}
+async function copySessionsToTeamDir(srcDir, destDir, derived) {
+  const sessions = await readSessionFiles(srcDir);
+  if (sessions.size === 0) return 0;
+  await mkdir10(destDir, { recursive: true });
+  for (const [filename, content] of sessions) {
+    if (derived) {
+      await writeFile11(join16(destDir, `${filename}.enc`), encrypt(content, derived));
+    } else {
+      await writeFile11(join16(destDir, filename), content);
+    }
+  }
+  return sessions.size;
+}
+async function copySessionsFromRepo(sessionsRoot, projectId, destDir, localCwd, derived) {
+  let devFolders;
+  try {
+    devFolders = await readdir4(sessionsRoot);
+  } catch {
+    return 0;
+  }
+  await mkdir10(destDir, { recursive: true });
+  let count = 0;
+  for (const email of devFolders) {
+    const projDir = join16(sessionsRoot, email, projectId);
+    let files;
+    try {
+      files = await readdir4(projDir);
+    } catch {
+      continue;
+    }
+    for (const file of files) {
+      try {
+        const isEnc = file.endsWith(".jsonl.enc");
+        const isPlain = file.endsWith(".jsonl") && !isEnc;
+        if (!isEnc && !isPlain) continue;
+        if (isEnc && !derived) continue;
+        let data = await readFile13(join16(projDir, file));
+        if (isEnc && derived) {
+          data = decrypt(data, derived);
+        }
+        const remoteCwd = extractCwdFromJsonl(data);
+        if (remoteCwd && remoteCwd !== localCwd) {
+          data = remapJsonlBuffer(data, remoteCwd, localCwd);
+        }
+        const destFilename = isEnc ? file.slice(0, -".enc".length) : file;
+        const destPath = join16(destDir, destFilename);
+        let finalPath = destPath;
+        try {
+          await readFile13(destPath);
+          const initials = email.split("@")[0].slice(0, 3);
+          const base = destFilename.slice(0, -".jsonl".length);
+          finalPath = join16(destDir, `${base}.${initials}.jsonl`);
+        } catch {
+        }
+        await writeFile11(finalPath, data);
+        count++;
+      } catch {
+        continue;
+      }
+    }
+  }
+  return count;
+}
+async function pushSessions(email, cwd, derived) {
+  const projectInfo = identifyProject(cwd);
+  if (!projectInfo) return 0;
+  const srcDir = localSessionsDir(cwd);
+  const destDir = teamSessionsDir(TEAM_DIR, email, projectInfo.projectId);
+  return copySessionsToTeamDir(srcDir, destDir, derived);
+}
+async function pullSessions(cwd, derived) {
+  const projectInfo = identifyProject(cwd);
+  if (!projectInfo) return 0;
+  const sessionsRoot = join16(TEAM_DIR, "sessions");
+  const destDir = localSessionsDir(cwd);
+  return copySessionsFromRepo(sessionsRoot, projectInfo.projectId, destDir, cwd, derived);
+}
+
 // src/commands/team/init.ts
 async function teamInitCommand(opts) {
   const config = await loadConfig();
@@ -1484,35 +1601,67 @@ Cloning ${repoUrl} \u2192 ~/.cortex/team/`);
   await cloneTeamRepo(repoUrl, token);
   const skills = await readSkillsFromDir(LOCAL_SKILLS_DIR);
   if (skills.size > 0) {
-    await mkdir10(join15(TEAM_DIR, "skills"), { recursive: true });
+    await mkdir11(join17(TEAM_DIR, "skills"), { recursive: true });
     for (const [filename, content] of skills) {
-      await writeFile10(join15(TEAM_DIR, "skills", filename), content, "utf-8");
+      await writeFile12(join17(TEAM_DIR, "skills", filename), content, "utf-8");
     }
-    console.log(`  Copied ${skills.size} skills`);
+    console.log(`  Copied ${skills.size} skills from .claude/skills/`);
   }
   const claudeMd = await readFileFromPath(LOCAL_CLAUDE_MD);
   if (claudeMd) {
-    await writeFile10(join15(TEAM_DIR, "CLAUDE.md"), claudeMd, "utf-8");
-    console.log("  Copied CLAUDE.md");
+    await writeFile12(join17(TEAM_DIR, "CLAUDE.md"), claudeMd, "utf-8");
+    console.log("  Copied .claude/CLAUDE.md");
   }
   const plugins = await getInstalledPluginIds();
   const cortexJson = { version: "1", plugins };
-  await writeFile10(join15(TEAM_DIR, "cortex.json"), JSON.stringify(cortexJson, null, 2), "utf-8");
+  await writeFile12(join17(TEAM_DIR, "cortex.json"), JSON.stringify(cortexJson, null, 2), "utf-8");
   console.log(`  Generated cortex.json (${plugins.length} plugins)`);
   commitAndPush(repoUrl, token, "feat: initial team Claude Code context");
-  const raw = JSON.parse(await readFile12(CONFIG_PATH, "utf-8"));
-  raw.teamRepo = repoUrl;
-  await writeFile10(CONFIG_PATH, JSON.stringify(raw, null, 2), "utf-8");
+  console.log("\n\u26A0  Compartir sesiones de chat");
+  console.log("   Tus sesiones de Claude Code para este proyecto se subir\xEDan");
+  console.log("   al repo de equipo y ser\xEDan visibles por todos los miembros.");
+  console.log("   Las sesiones pueden contener c\xF3digo privado o informaci\xF3n sensible.");
+  const shareSession = await confirm3({
+    message: "\xBFCompartir sesiones con el equipo?",
+    default: false
+  });
+  let encryptSessions = false;
+  if (shareSession) {
+    const encChoice = await select2({
+      message: "\xBFEncriptar las sesiones?",
+      choices: [
+        { name: "S\xED \u2014 encriptadas con passphrase del equipo (recomendado)", value: true },
+        { name: "No \u2014 JSONL plano (legible directo en GitHub)", value: false }
+      ]
+    });
+    encryptSessions = encChoice;
+    let derived;
+    if (encryptSessions) {
+      const teamPassphrase = await password5({
+        message: "Team passphrase (shared with all devs, min 12 chars):",
+        mask: "*",
+        validate: (v) => v.length >= 12 || "Minimum 12 characters"
+      });
+      derived = deriveKey(teamPassphrase, repoUrl);
+    }
+    const count = await pushSessions(config.email, process.cwd(), derived);
+    if (count > 0) {
+      commitAndPush(repoUrl, token, `feat: share ${count} team sessions`);
+      console.log(`  Uploaded ${count} sessions`);
+    }
+  }
+  await writeProjectConfig({ repo: repoUrl, shareSession, encryptSessions });
   console.log("\n\u2713 Team repo initialized and pushed.");
   console.log(`  Devs can now run: cortex install --repo ${repoUrl}`);
 }
 
 // src/commands/team/push.ts
-import { writeFile as writeFile11, mkdir as mkdir11 } from "fs/promises";
-import { join as join16 } from "path";
+import { writeFile as writeFile13, mkdir as mkdir12 } from "fs/promises";
+import { join as join18 } from "path";
+import { password as password6 } from "@inquirer/prompts";
 async function teamPushCommand() {
   const config = await loadConfig();
-  const repoUrl = config.teamRepo;
+  const { repo: repoUrl, shareSession, encryptSessions } = await readProjectConfig();
   const token = config.githubToken;
   if (!repoUrl) throw new Error('No team repo configured. Run "cortex team init --repo <url>" first.');
   if (!token) throw new Error('No GitHub token found. Run "cortex init" first.');
@@ -1521,31 +1670,45 @@ async function teamPushCommand() {
   pullTeamRepo();
   const skills = await readSkillsFromDir(LOCAL_SKILLS_DIR);
   if (skills.size > 0) {
-    await mkdir11(join16(TEAM_DIR, "skills"), { recursive: true });
+    await mkdir12(join18(TEAM_DIR, "skills"), { recursive: true });
     for (const [filename, content] of skills) {
-      await writeFile11(join16(TEAM_DIR, "skills", filename), content, "utf-8");
+      await writeFile13(join18(TEAM_DIR, "skills", filename), content, "utf-8");
     }
   }
   const claudeMd = await readFileFromPath(LOCAL_CLAUDE_MD);
   if (claudeMd) {
-    await writeFile11(join16(TEAM_DIR, "CLAUDE.md"), claudeMd, "utf-8");
+    await writeFile13(join18(TEAM_DIR, "CLAUDE.md"), claudeMd, "utf-8");
   }
   const plugins = await getInstalledPluginIds();
-  await writeFile11(
-    join16(TEAM_DIR, "cortex.json"),
+  await writeFile13(
+    join18(TEAM_DIR, "cortex.json"),
     JSON.stringify({ version: "1", plugins }, null, 2),
     "utf-8"
   );
+  if (shareSession) {
+    let derived;
+    if (encryptSessions) {
+      const teamPassphrase = await password6({
+        message: "Team passphrase:",
+        mask: "*",
+        validate: (v) => v.length >= 12 || "Minimum 12 characters"
+      });
+      derived = deriveKey(teamPassphrase, repoUrl);
+    }
+    const count = await pushSessions(config.email, process.cwd(), derived);
+    if (count > 0) console.log(`  Uploaded ${count} sessions`);
+  }
   commitAndPush(repoUrl, token, "chore: update team Claude Code context");
   console.log("\n\u2713 Pushed to team repo.");
 }
 
 // src/commands/team/pull.ts
-import { readFile as readFile13 } from "fs/promises";
-import { join as join17 } from "path";
+import { readFile as readFile14 } from "fs/promises";
+import { join as join19 } from "path";
+import { password as password7 } from "@inquirer/prompts";
 
 // src/lib/conflict.ts
-import { select as select2 } from "@inquirer/prompts";
+import { select as select3 } from "@inquirer/prompts";
 function hasConflict(local, remote) {
   return local.trim() !== remote.trim();
 }
@@ -1579,7 +1742,7 @@ function displayDiff(filename, local, remote) {
 }
 async function promptConflict(filename, local, remote) {
   displayDiff(filename, local, remote);
-  return select2({
+  return select3({
     message: "How to resolve?",
     choices: [
       { name: "[M] Merge \u2014 keep both versions", value: "merge" },
@@ -1591,13 +1754,13 @@ async function promptConflict(filename, local, remote) {
 
 // src/commands/team/pull.ts
 async function teamPullCommand() {
-  const config = await loadConfig();
-  const repoUrl = config.teamRepo;
+  await loadConfig();
+  const { repo: repoUrl, encryptSessions } = await readProjectConfig();
   if (!repoUrl) throw new Error('No team repo configured. Run "cortex team init --repo <url>" first.');
   if (!await hasLocalClone()) throw new Error('No local team clone found. Run "cortex install" first.');
   console.log("Pulling from team repo\u2026");
   pullTeamRepo();
-  const remoteSkills = await readSkillsFromDir(join17(TEAM_DIR, "skills"));
+  const remoteSkills = await readSkillsFromDir(join19(TEAM_DIR, "skills"));
   const localSkills = await readSkillsFromDir(LOCAL_SKILLS_DIR);
   for (const [filename, remoteContent] of remoteSkills) {
     const localContent = localSkills.get(filename) ?? null;
@@ -1618,7 +1781,7 @@ async function teamPullCommand() {
       console.log(`  ~ ${filename} skipped`);
     }
   }
-  const remoteMd = await readFileFromPath(join17(TEAM_DIR, "CLAUDE.md"));
+  const remoteMd = await readFileFromPath(join19(TEAM_DIR, "CLAUDE.md"));
   if (remoteMd) {
     const localMd = await readFileFromPath(LOCAL_CLAUDE_MD);
     if (!localMd) {
@@ -1637,24 +1800,37 @@ async function teamPullCommand() {
       }
     }
   }
-  let cortexJson = {};
+  let cortexManifest = {};
   try {
-    cortexJson = JSON.parse(await readFile13(join17(TEAM_DIR, "cortex.json"), "utf-8"));
+    cortexManifest = JSON.parse(await readFile14(join19(TEAM_DIR, "cortex.json"), "utf-8"));
   } catch {
   }
-  for (const pluginId of cortexJson.plugins ?? []) {
+  for (const pluginId of cortexManifest.plugins ?? []) {
     try {
       installPlugin(pluginId);
     } catch (e) {
       console.warn(`  \u26A0 Could not install ${pluginId}: ${e.message}`);
     }
   }
+  let derived;
+  if (encryptSessions) {
+    const teamPassphrase = await password7({
+      message: "Team passphrase (to decrypt sessions):",
+      mask: "*",
+      validate: (v) => v.length >= 12 || "Minimum 12 characters"
+    });
+    derived = deriveKey(teamPassphrase, repoUrl);
+  }
+  const sessionCount = await pullSessions(process.cwd(), derived);
+  if (sessionCount > 0) {
+    console.log(`  + ${sessionCount} sessions installed (restart Claude Code to see them)`);
+  }
   console.log("\n\u2713 Team context applied.");
 }
 
 // src/commands/install.ts
-import { readFile as readFile14, writeFile as writeFile13 } from "fs/promises";
-import { join as join18 } from "path";
+import { readFile as readFile15 } from "fs/promises";
+import { join as join20 } from "path";
 async function installCommand(opts) {
   let config;
   try {
@@ -1662,27 +1838,28 @@ async function installCommand(opts) {
   } catch {
     throw new Error('Run "cortex init" first to configure your GitHub token.');
   }
-  const repoUrl = opts.repo ?? config.teamRepo;
+  const projectConfig = await readProjectConfig();
+  const repoUrl = opts.repo ?? projectConfig.repo;
   if (!repoUrl) {
     throw new Error('No team repo URL. Pass --repo <url> or run "cortex team init" first.');
   }
   const token = config.githubToken;
   if (!token) throw new Error('No GitHub token found. Run "cortex init" first.');
-  console.log(`Installing from ${repoUrl}\u2026`);
+  console.log(`Installing from ${repoUrl} into ${process.cwd()}/.claude/`);
   await cloneTeamRepo(repoUrl, token);
-  const skills = await readSkillsFromDir(join18(TEAM_DIR, "skills"));
+  const skills = await readSkillsFromDir(join20(TEAM_DIR, "skills"));
   for (const [filename, content] of skills) {
     await writeSkillToDir(LOCAL_SKILLS_DIR, filename, content);
-    console.log(`  + ${filename}`);
+    console.log(`  + .claude/skills/${filename}`);
   }
-  const claudeMd = await readFileFromPath(join18(TEAM_DIR, "CLAUDE.md"));
+  const claudeMd = await readFileFromPath(join20(TEAM_DIR, "CLAUDE.md"));
   if (claudeMd) {
     await writeFileToPath(LOCAL_CLAUDE_MD, claudeMd);
-    console.log("  + CLAUDE.md");
+    console.log("  + .claude/CLAUDE.md");
   }
   let cortexJson = {};
   try {
-    cortexJson = JSON.parse(await readFile14(join18(TEAM_DIR, "cortex.json"), "utf-8"));
+    cortexJson = JSON.parse(await readFile15(join20(TEAM_DIR, "cortex.json"), "utf-8"));
   } catch {
   }
   for (const pluginId of cortexJson.plugins ?? []) {
@@ -1692,9 +1869,7 @@ async function installCommand(opts) {
       console.warn(`  \u26A0 Could not install ${pluginId}: ${e.message}`);
     }
   }
-  const raw = JSON.parse(await readFile14(CONFIG_PATH, "utf-8"));
-  raw.teamRepo = repoUrl;
-  await writeFile13(CONFIG_PATH, JSON.stringify(raw, null, 2), "utf-8");
+  await writeProjectConfig({ repo: repoUrl });
   console.log("\n\u2713 Team context installed. Restart Claude Code to activate new skills and plugins.");
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cortex-sync",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Sync Claude Code sessions between machines with automatic path remapping and skill conversion",
   "license": "AGPL-3.0",
   "type": "module",