trekoon 0.1.8 → 0.2.0

package/src/storage/path.ts

@@ -1,22 +1,79 @@
+import { spawnSync } from "node:child_process";
 import { resolve } from "node:path";
 
 const DB_DIRNAME = ".trekoon";
 const DB_FILENAME = "trekoon.db";
 
 export interface StoragePaths {
+  readonly invocationCwd: string;
   readonly worktreeRoot: string;
   readonly storageDir: string;
   readonly databaseFile: string;
+  readonly diagnostics: StoragePathDiagnostics;
+}
+
+export interface StoragePathIssue {
+  readonly code: string;
+  readonly message: string;
+  readonly invocationCwd: string;
+  readonly canonicalRoot: string;
+}
+
+export interface StoragePathDiagnostics {
+  readonly invocationCwd: string;
+  readonly canonicalRoot: string;
+  readonly warnings: readonly StoragePathIssue[];
+  readonly errors: readonly StoragePathIssue[];
+}
+
+function resolveGitTopLevel(workingDirectory: string): string | null {
+  const result = spawnSync("git", ["rev-parse", "--show-toplevel"], {
+    cwd: workingDirectory,
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "ignore"],
+  });
+
+  if (result.status !== 0) {
+    return null;
+  }
+
+  const topLevel: string = result.stdout.trim();
+  if (!topLevel) {
+    return null;
+  }
+
+  return resolve(topLevel);
 }
 
 export function resolveStoragePaths(workingDirectory: string = process.cwd()): StoragePaths {
-  const worktreeRoot: string = resolve(workingDirectory);
+  const invocationCwd: string = resolve(workingDirectory);
+  const canonicalRoot: string = resolveGitTopLevel(invocationCwd) ?? invocationCwd;
+  const worktreeRoot: string = canonicalRoot;
   const storageDir: string = resolve(worktreeRoot, DB_DIRNAME);
   const databaseFile: string = resolve(storageDir, DB_FILENAME);
+  const warnings: StoragePathIssue[] = [];
+
+  if (invocationCwd !== canonicalRoot) {
+    warnings.push({
+      code: "storage_root_diverged_from_cwd",
+      message: "Resolved storage root differs from invocation cwd.",
+      invocationCwd,
+      canonicalRoot,
+    });
+  }
+
+  const diagnostics: StoragePathDiagnostics = {
+    invocationCwd,
+    canonicalRoot,
+    warnings,
+    errors: [],
+  };
 
   return {
+    invocationCwd,
     worktreeRoot,
     storageDir,
     databaseFile,
+    diagnostics,
   };
 }

package/src/sync/event-writes.ts

@@ -11,11 +11,31 @@ interface EventRecordInput {
   readonly fields: Record<string, unknown>;
 }
 
+function nextEventTimestamp(db: Database): number {
+  const now: number = Date.now();
+  const latestEvent = db
+    .query(
+      `
+      SELECT created_at
+      FROM events
+      ORDER BY created_at DESC, id DESC
+      LIMIT 1;
+      `,
+    )
+    .get() as { created_at: number } | null;
+
+  if (!latestEvent) {
+    return now;
+  }
+
+  return Math.max(now, latestEvent.created_at + 1);
+}
+
 export function appendEventWithGitContext(db: Database, cwd: string, input: EventRecordInput): string {
   const git = resolveGitContext(cwd);
   persistGitContext(db, git);
 
-  const now: number = Date.now();
+  const now: number = nextEventTimestamp(db);
   const eventId: string = randomUUID();
 
   db.query(