claude-git-sessions 0.2.0 → 0.3.0

package/README.md

@@ -74,26 +74,32 @@ Branch names are validated with `git check-ref-format` before use.
 
 ## Commands
 
-### `ccgs pull`
+### `ccgs pull [--force] [--exclude-memory]`
 
-Fetches `@ccgs/<name>` and writes each session where Claude Code expects it:
-`~/.claude/projects/<local-slug>/<id>.jsonl`. The structural `cwd` field in each
-transcript line is rewritten from the author's path to your local equivalent so
-`claude --resume` works. (Absolute paths inside tool *output* are left as-is —
-cosmetic only.)
+Fetches `@ccgs/<name>` and writes each session into the **repo root's** project
+slug — `~/.claude/projects/<root-slug>/<id>.jsonl` — so that `claude --resume`
+run at the repo root lists every pulled session. The structural `cwd` field in
+each transcript line is rewritten from the author's path to your repo root so
+resume works. (Absolute paths inside tool *output* are left as-is — cosmetic.)
 
-If a local session is **newer** than the shared copy it is skipped with a
-warning; pass `--force` to overwrite anyway. Prints what was pulled / skipped.
+> Sessions are always placed under the repo-root slug, even if the author
+> launched Claude in a subdirectory. Honoring the author's subdir would put the
+> session in a separate (and possibly non-existent) slug dir where `--resume`
+> at the root can't see it. The original subdir is still recorded in `meta.json`.
 
-If the branch doesn't exist, it prints `nothing to pull` and exits 0.
+By default this **also pulls shared memory** (see `ccgs memory`); pass
+`--exclude-memory` for sessions only. If a local session is **newer** than the
+shared copy it is skipped with a warning; pass `--force` to overwrite. If the
+branch doesn't exist, it prints `nothing to pull` and exits 0.
 
-### `ccgs push [targets...]`
+### `ccgs push [targets...] [--exclude-memory]`
 
 Finds local sessions whose working directory is this repo (or a subdirectory),
 copies each transcript verbatim onto the orphan branch, and (re)generates its
 `meta.json`. With no arguments it pushes all of them; pass session ids/names to
-push only those. Creates the orphan branch on first push. Reports added vs
-updated.
+push only those. By default this **also pushes shared memory** (project /
+reference facts); pass `--exclude-memory` for sessions only. Creates the orphan
+branch on first push. Reports added vs updated.
 
 ### `ccgs delete <id|name> [--yes] [--local]`
 
@@ -109,6 +115,10 @@ Claude Code keeps per-project memory in `~/.claude/projects/<slug>/memory/` —
 one Markdown file per fact, plus a `MEMORY.md` index. `ccgs memory` shares those
 facts on the same orphan branch (under a `memory/` prefix).
 
+Plain `ccgs push` / `ccgs pull` already include memory by default (with the
+type filter below, i.e. no personal facts). Use these `memory` subcommands when
+you want memory **only**, or need `--all` to include personal facts.
+
 Memory is *mixed-sensitivity*, so it's filtered by the fact's frontmatter
 `type`:
 

package/dist/commands/pull.js

@@ -1,5 +1,4 @@
 import fs from "node:fs";
-import path from "node:path";
 import { SESSIONS_DIR } from "../constants.js";
 import { assertRemote, fetchBranch, localTrackingRef, showFile, validateBranchName, } from "../git.js";
 import { listBranchSessions } from "../branch-sessions.js";
@@ -28,9 +27,13 @@ export async function pull(opts) {
             skipped.push(`${shortId(id)}: missing transcript blob`);
             continue;
         }
-        // Reconstruct the local cwd for this session: repo root + recorded subdir.
-        const rel = meta?.cwdRelativeToRepoRoot ?? "";
-        const localCwd = rel ? path.join(opts.repoRoot, rel) : opts.repoRoot;
+        // Always land the session under the repo ROOT slug, so `claude --resume`
+        // run at the repo root lists it. (We deliberately do NOT honor the author's
+        // `cwdRelativeToRepoRoot` here: that placed subdir-authored sessions in a
+        // separate — and often non-existent — slug dir, making them invisible to
+        // resume at the root. The author's subdir is still recorded in meta for
+        // provenance.)
+        const localCwd = opts.repoRoot;
         const name = meta?.name ?? id;
         // Conflict policy: newer local copy is kept unless --force.
         const localFile = sessionFilePath(localCwd, id);

package/dist/index.js

@@ -8,7 +8,7 @@ import { deleteSession } from "./commands/delete.js";
 import { memoryPull, memoryPush } from "./commands/memory.js";
 // Kept in sync with package.json at publish time; hardcoded to avoid a JSON
 // import assertion just for --version.
-const VERSION = "0.2.0";
+const VERSION = "0.3.0";
 function globals(cmd) {
     const opts = cmd.optsWithGlobals();
     return {
@@ -34,24 +34,44 @@ program
     .option("--remote <remote>", "git remote to use", DEFAULT_REMOTE);
 program
     .command("pull")
-    .description("fetch shared sessions and place them where Claude Code can resume them")
+    .description("fetch shared sessions (and memory) and place them where Claude Code can resume them")
     .option("--force", "overwrite local copies even if they are newer", false)
+    .option("--exclude-memory", "pull sessions only; do not also pull memory", false)
     .action(async (localOpts, cmd) => {
     const g = globals(cmd);
     await run(async () => {
         const root = await repoRoot();
-        return pull({ repoRoot: root, remote: g.remote, branch: g.branch, force: localOpts.force });
+        let code = await pull({ repoRoot: root, remote: g.remote, branch: g.branch, force: localOpts.force });
+        if (!localOpts.excludeMemory) {
+            console.log("\nMemory:");
+            const m = await memoryPull({
+                repoRoot: root,
+                remote: g.remote,
+                branch: g.branch,
+                all: false,
+                force: localOpts.force,
+            });
+            code = code || m;
+        }
+        return code;
     });
 });
 program
     .command("push")
-    .description("publish this repo's local sessions to the orphan branch")
+    .description("publish this repo's local sessions (and shared memory) to the orphan branch")
     .argument("[targets...]", "optional session ids/names to push (default: all)")
-    .action(async (targets, _localOpts, cmd) => {
+    .option("--exclude-memory", "push sessions only; do not also push memory", false)
+    .action(async (targets, localOpts, cmd) => {
     const g = globals(cmd);
     await run(async () => {
         const root = await repoRoot();
-        return push({ repoRoot: root, remote: g.remote, branch: g.branch, filters: targets });
+        let code = await push({ repoRoot: root, remote: g.remote, branch: g.branch, filters: targets });
+        if (!localOpts.excludeMemory) {
+            console.log("\nMemory:");
+            const m = await memoryPush({ repoRoot: root, remote: g.remote, branch: g.branch, all: false });
+            code = code || m;
+        }
+        return code;
     });
 });
 program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-git-sessions",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Share Claude Code sessions across a team through an orphan git branch in your existing repo.",
   "keywords": ["claude", "claude-code", "git", "sessions", "cli"],
   "license": "MIT",