trajectories 0.1.3 → 0.1.5

package/CHANGELOG.md

@@ -10,6 +10,7 @@
 
 ### Fixed
 
+- Observed `remote pull --machine` skips origin rows only when a local `shared://` copy already exists, so a lost SQLite can recover its own history.
 - The sync worker-deadline regression isolates worker admission from database setup, retaining real abort/reap and resume checks without a CI scheduling-speed assumption.
 
 ## 0.1.2

package/dist/cli.js

@@ -9182,7 +9182,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "trajectories",
-    version: "0.1.3",
+    version: "0.1.5",
     description: "Portable coding-agent sessions: read, search, convert, and continue across harnesses.",
     type: "module",
     license: "Apache-2.0",
@@ -9239,7 +9239,7 @@ var init_package = __esm(() => {
     publishConfig: {
       access: "public"
     },
-    gitHead: "fa1591e54eaeec7d48a8edfaa086d46fd9b2d4f3"
+    gitHead: "2e6e5983c65895f1a2e3d8364eaf06646fd1ea43"
   };
 });
 
@@ -31071,6 +31071,17 @@ function project2(state) {
     records: state.records.map((record) => ({ ...record, id: `${id}:${record.id}`, session_id: id }))
   };
 }
+function localSharedSession(dbPath, observationId) {
+  if (isMemoryStorePath(dbPath) || !existsSync15(dbPath))
+    return null;
+  const reader = new TrajectoryReader(dbPath);
+  try {
+    const local = reader.getSession(`shared:${observationId}`);
+    return local?.source_path.startsWith("shared://") ? local : null;
+  } finally {
+    reader.close();
+  }
+}
 async function runSharedCli(argv) {
   if (!argv.length || argv.some((value) => value === "--help" || value === "-h") || argv[0] === "help") {
     console.log(help2);
@@ -31200,21 +31211,14 @@ async function runSharedCli(argv) {
   }
   const observed = [];
   for (const item of await client.listObserved()) {
-    if (item.machineId === machine) {
+    const local = localSharedSession(dbPath, item.id);
+    if (item.machineId === machine && local) {
       observed.push({ id: item.id, head: item.head, outcome: "skipped-origin" });
       continue;
     }
-    if (!isMemoryStorePath(dbPath) && existsSync15(dbPath)) {
-      const reader = new TrajectoryReader(dbPath);
-      try {
-        const local = reader.getSession(`shared:${item.id}`);
-        if (local?.source_path.startsWith("shared://") && local.content_hash === item.head) {
-          observed.push({ id: item.id, head: item.head, records: local.record_count, outcome: "unchanged" });
-          continue;
-        }
-      } finally {
-        reader.close();
-      }
+    if (local && local.content_hash === item.head) {
+      observed.push({ id: item.id, head: item.head, records: local.record_count, outcome: "unchanged" });
+      continue;
     }
     const state = await client.getObserved(item.id);
     const lease = isMemoryStorePath(dbPath) ? null : acquireWriterLease(dbPath, { holder: "trajectories remote pull" });
@@ -31288,7 +31292,7 @@ Token path fallback: TRAJECTORIES_REMOTE_TOKEN_FILE. Tokens never belong in URLs
 Push publishes observed canonical records; native files are not uploaded by this lane.
 --store additionally synchronizes managed logs and their referenced objects.
 Pull updates the existing SQLite lexical index; it never launches native harnesses.
-Pull --machine skips that originating machine's observed rows already stored locally.
+Pull --machine skips that originating machine's observed rows when a local shared:// copy is already stored.
 `;
 var init_shared2 = __esm(() => {
   init_canonical3();

package/docs/shared-history.md

@@ -75,10 +75,11 @@ that a refreshed remote head is an ancestor of its accepted local chain and repo
 with other sessions, indexes available accepted histories and prints its summary
 before exiting nonzero. It does not merge conflicting branches automatically.
 
-When pulling into a machine's existing native index, pass the same stable
-`--machine` ID used by its pushes. Its own observed sessions are reported as
-`skipped-origin`, so native rows remain the only local copy while other machines'
-histories are imported. Omit this option when building a complete separate mirror.
+When pulling with the same stable `--machine` ID used by its pushes, that
+origin's observed rows are reported as `skipped-origin` only when a local
+`shared://` copy already exists. A machine that lost its SQLite (or never stored
+those rows) still imports them. Other machines' histories are imported as usual.
+Omit `--machine` when building a complete separate mirror.
 
 Pull never launches a harness, takes native execution ownership or migrates a
 workspace. A restored managed session retains its workspace reference; preparing

package/legacy/src/shared.ts

@@ -27,7 +27,7 @@ Token path fallback: TRAJECTORIES_REMOTE_TOKEN_FILE. Tokens never belong in URLs
 Push publishes observed canonical records; native files are not uploaded by this lane.
 --store additionally synchronizes managed logs and their referenced objects.
 Pull updates the existing SQLite lexical index; it never launches native harnesses.
-Pull --machine skips that originating machine's observed rows already stored locally.
+Pull --machine skips that originating machine's observed rows when a local shared:// copy is already stored.
 `;
 
 function required(value: string | undefined, option: string): string {
@@ -63,6 +63,15 @@ function project(state: ObservedState) {
   };
 }
 
+function localSharedSession(dbPath: string, observationId: string) {
+  if (isMemoryStorePath(dbPath) || !existsSync(dbPath)) return null;
+  const reader = new TrajectoryReader(dbPath);
+  try {
+    const local = reader.getSession(`shared:${observationId}`);
+    return local?.source_path.startsWith('shared://') ? local : null;
+  } finally { reader.close(); }
+}
+
 export async function runSharedCli(argv: string[]): Promise<void> {
   // Help must not open SQLite, managed stores, credentials or sockets.
   if (!argv.length || argv.some(value => value === '--help' || value === '-h') || argv[0] === 'help') { console.log(help); return; }
@@ -155,19 +164,14 @@ export async function runSharedCli(argv: string[]): Promise<void> {
   }
   const observed = [];
   for (const item of await client.listObserved()) {
-    if (item.machineId === machine) {
+    const local = localSharedSession(dbPath, item.id);
+    if (item.machineId === machine && local) {
       observed.push({ id: item.id, head: item.head, outcome: 'skipped-origin' });
       continue;
     }
-    if (!isMemoryStorePath(dbPath) && existsSync(dbPath)) {
-      const reader = new TrajectoryReader(dbPath);
-      try {
-        const local = reader.getSession(`shared:${item.id}`);
-        if (local?.source_path.startsWith('shared://') && local.content_hash === item.head) {
-          observed.push({ id: item.id, head: item.head, records: local.record_count, outcome: 'unchanged' });
-          continue;
-        }
-      } finally { reader.close(); }
+    if (local && local.content_hash === item.head) {
+      observed.push({ id: item.id, head: item.head, records: local.record_count, outcome: 'unchanged' });
+      continue;
     }
     const state = await client.getObserved(item.id);
     const lease = isMemoryStorePath(dbPath) ? null : acquireWriterLease(dbPath, { holder: 'trajectories remote pull' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trajectories",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Portable coding-agent sessions: read, search, convert, and continue across harnesses.",
   "type": "module",
   "license": "Apache-2.0",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fa1591e54eaeec7d48a8edfaa086d46fd9b2d4f3"
+  "gitHead": "2e6e5983c65895f1a2e3d8364eaf06646fd1ea43"
 }