sidediff 0.3.0 → 0.3.1

package/README.md

@@ -49,7 +49,7 @@ sidediff note clear [--file src/app.ts]
 
 `--new-line` targets the new side of the diff, `--old-line` the old side. The batch format matches Hunk's `session comment apply`, so existing agent tooling can target either.
 
-Notes are stored one file per note under `<git dir>/sidediff/notes`, so concurrent writers never collide and nothing is committed to the repository.
+Notes, review threads and the running server's address are stored per worktree under `$XDG_STATE_HOME/sidediff/<worktree>/` (`~/.local/state/sidediff/<worktree>/` by default), one file per note, so concurrent writers never collide, nothing is committed to the repository, worktrees of the same repository never see each other's notes, and a review's annotations and threads come back when its server restarts. Versions before 0.3.1 kept them in the repository's shared `<git dir>/sidediff`; those files are left where they are.
 
 ## Review threads
 

package/dist/git.js

@@ -32,7 +32,6 @@ export class Git extends Context.Service()('sidediff/Git') {
         return {
             run,
             repoRoot: (cwd) => trimmed(cwd, ['rev-parse', '--show-toplevel']),
-            commonDir: (cwd) => trimmed(cwd, ['rev-parse', '--path-format=absolute', '--git-common-dir']),
             branch: (cwd) => trimmed(cwd, ['rev-parse', '--abbrev-ref', 'HEAD']).pipe(Effect.orElseSucceed(() => 'HEAD')),
             diff: (cwd, range) => run(cwd, ['-c', 'core.quotepath=false', 'diff', '--no-color', '--no-ext-diff', '--find-renames', ...range]),
             sides,

package/dist/repo.js

@@ -1,12 +1,14 @@
-import { Context, Effect, Layer, Path } from 'effect';
+import { Config, Context, Effect, Layer, Path } from 'effect';
 import { Git } from './git.js';
+const worktreeKey = (root) => root.replace(/^\/+/, '').replaceAll('/', '-');
 export class Repo extends Context.Service()('sidediff/Repo') {
     static layer = Layer.effect(Repo, Effect.gen(function* () {
         const git = yield* Git;
         const path = yield* Path.Path;
         const root = yield* git.repoRoot(process.cwd());
-        const common = yield* git.commonDir(root);
-        const state = path.join(common, 'sidediff');
+        const home = yield* Effect.orDie(Config.String('HOME'));
+        const stateHome = yield* Effect.orDie(Config.NonEmptyString('XDG_STATE_HOME').pipe(Config.withDefault(path.join(home, '.local', 'state'))));
+        const state = path.join(stateHome, 'sidediff', worktreeKey(root));
         return { root, notes: path.join(state, 'notes'), state, serverFile: path.join(state, 'server.json') };
     }));
 }

package/dist/server.js

@@ -198,7 +198,7 @@ const Announce = Layer.effectDiscard(Effect.gen(function* () {
     const repo = yield* Repo;
     const options = yield* ServeOptions;
     const info = { port: options.port, host: options.host, pid: process.pid };
-    yield* Effect.acquireRelease(fs.writeFileString(repo.serverFile, JSON.stringify(Schema.encodeSync(ServerInfo)(info))), () => fs.readFileString(repo.serverFile).pipe(Effect.flatMap(Schema.decodeUnknownEffect(Schema.fromJsonString(ServerInfo))), Effect.flatMap((current) => current.pid === info.pid ? fs.remove(repo.serverFile, { force: true }) : Effect.void), Effect.ignore));
+    yield* Effect.acquireRelease(fs.makeDirectory(repo.state, { recursive: true }).pipe(Effect.andThen(fs.writeFileString(repo.serverFile, JSON.stringify(Schema.encodeSync(ServerInfo)(info))))), () => fs.readFileString(repo.serverFile).pipe(Effect.flatMap(Schema.decodeUnknownEffect(Schema.fromJsonString(ServerInfo))), Effect.flatMap((current) => current.pid === info.pid ? fs.remove(repo.serverFile, { force: true }) : Effect.void), Effect.ignore));
 }));
 export const serverLayer = (options) => HttpRouter.serve(Layer.mergeAll(RpcRoute, StaticFiles), { disableListenLog: true, disableLogger: true }).pipe(Layer.provide(Review.layer), Layer.merge(Announce), Layer.provide(NodeHttpServer.layer(createServer, {
     port: options.port,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sidediff",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "GitHub-style diff review in the browser, with a live notes column for humans and agents",
   "license": "MIT",
   "type": "module",