@unpolarize/code-sessions 0.4.0 → 0.5.0

package/dist/{chunk-3VPXOUIE.js → chunk-Y7DRROK7.js}

@@ -634,17 +634,32 @@ var GitStore = class {
   isRepo() {
     return existsSync5(join3(this.dir, ".git"));
   }
-  /** Initialize the store repo (idempotent): git init, scaffolding files, remote. */
+  /** Initialize the store repo (idempotent): git init, connect remote (adopting
+   * its existing history on a fresh clone so a second machine continues the same
+   * store instead of forking), then write scaffolding files if still absent. */
   init() {
     if (!this.isRepo()) {
       const r = spawnSync("git", ["init", "-b", "main", this.dir], { encoding: "utf8" });
       if (r.status !== 0) throw new Error(`git init failed: ${r.stderr}`);
     }
+    if (this.opts.remote) {
+      this.ensureRemote(this.opts.remote);
+      this.adoptRemoteIfEmpty();
+    }
     const giPath = join3(this.dir, ".gitignore");
     if (!existsSync5(giPath)) writeFileSync3(giPath, GITIGNORE);
     const gaPath = join3(this.dir, ".gitattributes");
     if (!existsSync5(gaPath)) writeFileSync3(gaPath, GITATTRIBUTES);
-    if (this.opts.remote) this.ensureRemote(this.opts.remote);
+  }
+  /** When this clone has no commits yet, pull the remote's existing store so we
+   * continue its history (multi-machine) rather than starting a divergent one.
+   * No-op for an empty/unreachable remote. */
+  adoptRemoteIfEmpty() {
+    if (this.run(["rev-parse", "--verify", "HEAD"]).ok) return;
+    if (!this.run(["fetch", "origin"]).ok) return;
+    if (!this.run(["rev-parse", "--verify", "origin/main"]).ok) return;
+    this.run(["reset", "--hard", "origin/main"]);
+    this.run(["branch", "--set-upstream-to=origin/main", "main"]);
   }
   ensureRemote(remote) {
     const existing = this.run(["remote", "get-url", "origin"]);
@@ -2498,7 +2513,17 @@ function cmdInit(cfg) {
   if (!existsSync16(configPath)) {
     writeFileSync9(
       configPath,
-      `${JSON.stringify({ insights: cfg.insights, batch: cfg.batch, hygiene: cfg.hygiene }, null, 2)}
+      `${JSON.stringify(
+        {
+          insights: cfg.insights,
+          batch: cfg.batch,
+          hygiene: cfg.hygiene,
+          // persist the remote so the daemon/CLI keep pushing here without flags
+          git: { ...cfg.git.remote ? { remote: cfg.git.remote } : {}, autoPush: cfg.git.autoPush }
+        },
+        null,
+        2
+      )}
 `
     );
   }

package/dist/cli.js

@@ -24,7 +24,7 @@ import {
   parseFlags,
   readStdin,
   startDaemon
-} from "./chunk-3VPXOUIE.js";
+} from "./chunk-Y7DRROK7.js";
 
 // src/analytics/command.ts
 import { mkdirSync, writeFileSync } from "fs";

package/dist/index.js

@@ -93,7 +93,7 @@ import {
   writeBlobFile,
   writeImportedSession,
   writeTurnFile
-} from "./chunk-3VPXOUIE.js";
+} from "./chunk-Y7DRROK7.js";
 export {
   CaptureEngine,
   DEFAULT_HOOK_EVENTS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unpolarize/code-sessions",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Headless, event-driven cross-agent session capture agent (daemon + CLI)",
   "license": "MIT",
   "type": "module",
@@ -25,7 +25,7 @@
     "build": "tsup src/index.ts src/cli.ts --format esm --clean --out-dir dist"
   },
   "dependencies": {
-    "@unpolarize/code-sessions-schema": "^0.4.0",
+    "@unpolarize/code-sessions-schema": "^0.5.0",
     "zod": "^3.23.8"
   }
 }

package/src/commands.ts

@@ -59,7 +59,17 @@ export function cmdInit(cfg: CodeSessionsConfig): CommandResult {
   if (!existsSync(configPath)) {
     writeFileSync(
       configPath,
-      `${JSON.stringify({ insights: cfg.insights, batch: cfg.batch, hygiene: cfg.hygiene }, null, 2)}\n`,
+      `${JSON.stringify(
+        {
+          insights: cfg.insights,
+          batch: cfg.batch,
+          hygiene: cfg.hygiene,
+          // persist the remote so the daemon/CLI keep pushing here without flags
+          git: { ...(cfg.git.remote ? { remote: cfg.git.remote } : {}), autoPush: cfg.git.autoPush },
+        },
+        null,
+        2,
+      )}\n`,
     );
   }
   git.commit('init store');

package/src/store/git.ts

@@ -58,17 +58,35 @@ export class GitStore {
     return existsSync(join(this.dir, '.git'));
   }
 
-  /** Initialize the store repo (idempotent): git init, scaffolding files, remote. */
+  /** Initialize the store repo (idempotent): git init, connect remote (adopting
+   * its existing history on a fresh clone so a second machine continues the same
+   * store instead of forking), then write scaffolding files if still absent. */
   init(): void {
     if (!this.isRepo()) {
       const r = spawnSync('git', ['init', '-b', 'main', this.dir], { encoding: 'utf8' });
       if (r.status !== 0) throw new Error(`git init failed: ${r.stderr}`);
     }
+    // Connect + adopt remote BEFORE writing scaffolding, so an adopted checkout
+    // doesn't collide with untracked .gitignore/.gitattributes we'd write.
+    if (this.opts.remote) {
+      this.ensureRemote(this.opts.remote);
+      this.adoptRemoteIfEmpty();
+    }
     const giPath = join(this.dir, '.gitignore');
     if (!existsSync(giPath)) writeFileSync(giPath, GITIGNORE);
     const gaPath = join(this.dir, '.gitattributes');
     if (!existsSync(gaPath)) writeFileSync(gaPath, GITATTRIBUTES);
-    if (this.opts.remote) this.ensureRemote(this.opts.remote);
+  }
+
+  /** When this clone has no commits yet, pull the remote's existing store so we
+   * continue its history (multi-machine) rather than starting a divergent one.
+   * No-op for an empty/unreachable remote. */
+  private adoptRemoteIfEmpty(): void {
+    if (this.run(['rev-parse', '--verify', 'HEAD']).ok) return; // already has local history
+    if (!this.run(['fetch', 'origin']).ok) return; // empty or unreachable remote
+    if (!this.run(['rev-parse', '--verify', 'origin/main']).ok) return; // remote has no main
+    this.run(['reset', '--hard', 'origin/main']);
+    this.run(['branch', '--set-upstream-to=origin/main', 'main']);
   }
 
   ensureRemote(remote: string): void {