spidersan 0.20.2 → 0.22.0

package/dist/lib/supabase-credentials.d.ts

@@ -1,36 +1,18 @@
 /**
- * Single source of truth for resolving spidersan's Supabase credentials.
+ * Supabase environment credentials, for the activity log only.
  *
- * Precedence: SPIDERSAN_SUPABASE_* → SUPABASE_* → config.storage.*
+ * Cross-machine registry sync no longer uses these: it goes through a configured
+ * storage.syncModule (see src/storage/registry-sync.ts). This stays because
+ * src/lib/activity.ts still uploads the optional activity log with them, and
+ * `spidersan config` reports whether they are set.
  *
- * SPIDERSAN_SUPABASE_* MUST come first. envoak's vault-inject guard drops any
- * secret whose name carries a bare SUPABASE_ prefix, so vault-injected creds
- * only ever arrive under the scoped names. Resolvers checking just the bare
- * names silently no-op under `envoak vault inject` — the production hook path —
- * and report "Supabase not configured" while a valid grant is present (fc8cf22,
- * 29aa575, tb-efmm; tb-ly0b found 7 more copies with the same defect).
- *
- * This module exists so that stays fixed in ONE place. Do not re-derive these
- * env names inline; call resolveSupabaseCredentials()/resolveSupabaseEnv().
- *
- * COLONY_SUPABASE_* is deliberately absent from the chain: colony points at a
- * different Supabase project, so falling back to it would silently write
- * spider_registries into the wrong database (tb-ly0b).
- */
-export interface SupabaseCredentials {
-    url: string;
-    key: string;
-}
-/**
- * Env-only resolution. For callers with no config file in scope (subscribers,
- * activity logging) that need a synchronous answer.
+ * Precedence: SPIDERSAN_SUPABASE_* → SUPABASE_*. The scoped names come first
+ * because some secret injectors refuse to pass a bare SUPABASE_* name, and a
+ * resolver that checked only the bare names would silently report "not set".
  */
+/** Env-only resolution; either field is undefined when unset. */
 export declare function resolveSupabaseEnv(): {
     url?: string;
     key?: string;
 };
-/**
- * Env → config.storage. The default for commands; null when unconfigured.
- */
-export declare function resolveSupabaseCredentials(basePath?: string): Promise<SupabaseCredentials | null>;
 //# sourceMappingURL=supabase-credentials.d.ts.map

package/dist/lib/supabase-credentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"supabase-credentials.d.ts","sourceRoot":"","sources":["../../src/lib/supabase-credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAIH,MAAM,WAAW,mBAAmB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAKnE;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAC5C,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAQrC"}
+{"version":3,"file":"supabase-credentials.d.ts","sourceRoot":"","sources":["../../src/lib/supabase-credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,iEAAiE;AACjE,wBAAgB,kBAAkB,IAAI;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAKnE"}

package/dist/lib/supabase-credentials.js

@@ -1,43 +1,20 @@
 /**
- * Single source of truth for resolving spidersan's Supabase credentials.
+ * Supabase environment credentials, for the activity log only.
  *
- * Precedence: SPIDERSAN_SUPABASE_* → SUPABASE_* → config.storage.*
+ * Cross-machine registry sync no longer uses these: it goes through a configured
+ * storage.syncModule (see src/storage/registry-sync.ts). This stays because
+ * src/lib/activity.ts still uploads the optional activity log with them, and
+ * `spidersan config` reports whether they are set.
  *
- * SPIDERSAN_SUPABASE_* MUST come first. envoak's vault-inject guard drops any
- * secret whose name carries a bare SUPABASE_ prefix, so vault-injected creds
- * only ever arrive under the scoped names. Resolvers checking just the bare
- * names silently no-op under `envoak vault inject` — the production hook path —
- * and report "Supabase not configured" while a valid grant is present (fc8cf22,
- * 29aa575, tb-efmm; tb-ly0b found 7 more copies with the same defect).
- *
- * This module exists so that stays fixed in ONE place. Do not re-derive these
- * env names inline; call resolveSupabaseCredentials()/resolveSupabaseEnv().
- *
- * COLONY_SUPABASE_* is deliberately absent from the chain: colony points at a
- * different Supabase project, so falling back to it would silently write
- * spider_registries into the wrong database (tb-ly0b).
- */
-import { loadConfig } from './config.js';
-/**
- * Env-only resolution. For callers with no config file in scope (subscribers,
- * activity logging) that need a synchronous answer.
+ * Precedence: SPIDERSAN_SUPABASE_* → SUPABASE_*. The scoped names come first
+ * because some secret injectors refuse to pass a bare SUPABASE_* name, and a
+ * resolver that checked only the bare names would silently report "not set".
  */
+/** Env-only resolution; either field is undefined when unset. */
 export function resolveSupabaseEnv() {
     return {
         url: process.env.SPIDERSAN_SUPABASE_URL || process.env.SUPABASE_URL,
         key: process.env.SPIDERSAN_SUPABASE_KEY || process.env.SUPABASE_KEY,
     };
 }
-/**
- * Env → config.storage. The default for commands; null when unconfigured.
- */
-export async function resolveSupabaseCredentials(basePath) {
-    const env = resolveSupabaseEnv();
-    const config = await loadConfig(basePath);
-    const url = env.url || config.storage.supabaseUrl;
-    const key = env.key || config.storage.supabaseKey;
-    if (!url || !key)
-        return null;
-    return { url, key };
-}
 //# sourceMappingURL=supabase-credentials.js.map

package/dist/lib/supabase-credentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"supabase-credentials.js","sourceRoot":"","sources":["../../src/lib/supabase-credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAOzC;;;GAGG;AACH,MAAM,UAAU,kBAAkB;IAC9B,OAAO;QACH,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY;QACnE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY;KACtE,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC5C,QAAiB;IAEjB,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;IACjC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAClD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAElD,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAC9B,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AACxB,CAAC"}
+{"version":3,"file":"supabase-credentials.js","sourceRoot":"","sources":["../../src/lib/supabase-credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,iEAAiE;AACjE,MAAM,UAAU,kBAAkB;IAC9B,OAAO;QACH,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY;QACnE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY;KACtE,CAAC;AACN,CAAC"}

package/dist/storage/factory.d.ts

@@ -1,5 +1,8 @@
 /**
- * Storage factory - selects the right storage backend
+ * Storage factory.
+ *
+ * The branch registry is always the local JSON store. Cross-machine sync is a
+ * separate concern, resolved by resolveRegistrySync() from storage.syncModule.
  */
 import type { StorageAdapter } from './adapter.js';
 export declare function getStorage(): Promise<StorageAdapter>;

package/dist/storage/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,wBAAsB,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC,CAQ1D"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,wBAAsB,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC,CAE1D"}

package/dist/storage/factory.js

@@ -1,14 +1,11 @@
 /**
- * Storage factory - selects the right storage backend
+ * Storage factory.
+ *
+ * The branch registry is always the local JSON store. Cross-machine sync is a
+ * separate concern, resolved by resolveRegistrySync() from storage.syncModule.
  */
 import { LocalStorage } from './local.js';
-import { SupabaseStorage } from './supabase.js';
-import { resolveSupabaseCredentials } from '../lib/supabase-credentials.js';
 export async function getStorage() {
-    const supabaseConfig = await resolveSupabaseCredentials();
-    if (supabaseConfig) {
-        return new SupabaseStorage(supabaseConfig);
-    }
     return new LocalStorage();
 }
 //# sourceMappingURL=factory.js.map

package/dist/storage/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAE5E,MAAM,CAAC,KAAK,UAAU,UAAU;IAC5B,MAAM,cAAc,GAAG,MAAM,0BAA0B,EAAE,CAAC;IAE1D,IAAI,cAAc,EAAE,CAAC;QACjB,OAAO,IAAI,eAAe,CAAC,cAAc,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,IAAI,YAAY,EAAE,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,MAAM,CAAC,KAAK,UAAU,UAAU;IAC5B,OAAO,IAAI,YAAY,EAAE,CAAC;AAC9B,CAAC"}

package/dist/storage/index.d.ts

@@ -5,6 +5,5 @@ export * from './json-branch-registry-store.js';
 export * from './memory-branch-registry-store.js';
 export * from './supabase.js';
 export * from './supabase-registry-sync-client.js';
-export * from './supabase-registry-sync-client-impl.js';
 export * from './factory.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/storage/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/storage/index.ts"],"names":[],"mappings":"AACA,cAAc,cAAc,CAAC;AAC7B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,YAAY,CAAC;AAC3B,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,eAAe,CAAC;AAC9B,cAAc,oCAAoC,CAAC;AACnD,cAAc,yCAAyC,CAAC;AACxD,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/storage/index.ts"],"names":[],"mappings":"AACA,cAAc,cAAc,CAAC;AAC7B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,YAAY,CAAC;AAC3B,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,eAAe,CAAC;AAC9B,cAAc,oCAAoC,CAAC;AACnD,cAAc,cAAc,CAAC"}

package/dist/storage/index.js

@@ -6,6 +6,5 @@ export * from './json-branch-registry-store.js';
 export * from './memory-branch-registry-store.js';
 export * from './supabase.js';
 export * from './supabase-registry-sync-client.js';
-export * from './supabase-registry-sync-client-impl.js';
 export * from './factory.js';
 //# sourceMappingURL=index.js.map

package/dist/storage/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/storage/index.ts"],"names":[],"mappings":"AAAA,0BAA0B;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,YAAY,CAAC;AAC3B,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,eAAe,CAAC;AAC9B,cAAc,oCAAoC,CAAC;AACnD,cAAc,yCAAyC,CAAC;AACxD,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/storage/index.ts"],"names":[],"mappings":"AAAA,0BAA0B;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,YAAY,CAAC;AAC3B,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,eAAe,CAAC;AAC9B,cAAc,oCAAoC,CAAC;AACnD,cAAc,cAAc,CAAC"}

package/dist/storage/registry-sync.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Which cross-machine registry backend to use.
+ *
+ * Cross-machine sync is pluggable only: a deployment supplies its own
+ * SupabaseRegistrySyncClient as an ES module that exports
+ * `createRegistrySyncClient()` (sync or async), named by SPIDERSAN_SYNC_MODULE or
+ * `storage.syncModule` in the USER's ~/.spidersanrc. A repo-local .spidersanrc is
+ * never consulted for this: it would let any cloned repo run code on
+ * `spidersan conflicts`.
+ *
+ * There is no built-in client any more. The hosted registry tables it talked to
+ * are being dropped, so without a module there is no cross-machine sync, and
+ * callers say so with syncModuleRequiredMessage() rather than reporting "no
+ * conflicts" or failing on a missing table.
+ */
+import { SupabaseStorage } from './supabase.js';
+export declare function syncModulePath(): Promise<string | undefined>;
+/** The configured sync client, or null when no storage.syncModule is set. */
+export declare function resolveRegistrySync(): Promise<SupabaseStorage | null>;
+/**
+ * The one message for "cross-machine sync asked for, no module configured".
+ * Mentions the legacy credentials when they are still set: someone upgrading
+ * with SUPABASE_* in their environment would otherwise assume sync still works.
+ */
+export declare function syncModuleRequiredMessage(): string[];
+//# sourceMappingURL=registry-sync.d.ts.map

package/dist/storage/registry-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registry-sync.d.ts","sourceRoot":"","sources":["../../src/storage/registry-sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,wBAAsB,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAWlE;AAED,6EAA6E;AAC7E,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAQ3E;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,EAAE,CAYpD"}

package/dist/storage/registry-sync.js

@@ -0,0 +1,66 @@
+/**
+ * Which cross-machine registry backend to use.
+ *
+ * Cross-machine sync is pluggable only: a deployment supplies its own
+ * SupabaseRegistrySyncClient as an ES module that exports
+ * `createRegistrySyncClient()` (sync or async), named by SPIDERSAN_SYNC_MODULE or
+ * `storage.syncModule` in the USER's ~/.spidersanrc. A repo-local .spidersanrc is
+ * never consulted for this: it would let any cloned repo run code on
+ * `spidersan conflicts`.
+ *
+ * There is no built-in client any more. The hosted registry tables it talked to
+ * are being dropped, so without a module there is no cross-machine sync, and
+ * callers say so with syncModuleRequiredMessage() rather than reporting "no
+ * conflicts" or failing on a missing table.
+ */
+import { homedir } from 'node:os';
+import { isAbsolute, join } from 'node:path';
+import { pathToFileURL } from 'node:url';
+import { loadConfigWithSources } from '../lib/config.js';
+import { resolveSupabaseEnv } from '../lib/supabase-credentials.js';
+import { SupabaseStorage } from './supabase.js';
+export async function syncModulePath() {
+    let p = process.env.SPIDERSAN_SYNC_MODULE;
+    if (!p) {
+        // home dir only: includeGlobal=false with basePath=home reads just ~/.spidersanrc*
+        const { config } = await loadConfigWithSources(homedir(), { includeGlobal: false });
+        p = config.storage.syncModule;
+    }
+    if (!p)
+        return undefined;
+    if (p.startsWith('~/'))
+        p = join(homedir(), p.slice(2));
+    if (!isAbsolute(p))
+        throw new Error(`storage.syncModule must be an absolute path (or ~/...), got ${p}`);
+    return p;
+}
+/** The configured sync client, or null when no storage.syncModule is set. */
+export async function resolveRegistrySync() {
+    const mod = await syncModulePath();
+    if (!mod)
+        return null;
+    const m = await import(pathToFileURL(mod).href);
+    if (typeof m.createRegistrySyncClient !== 'function') {
+        throw new Error(`${mod} does not export createRegistrySyncClient()`);
+    }
+    return new SupabaseStorage(await m.createRegistrySyncClient());
+}
+/**
+ * The one message for "cross-machine sync asked for, no module configured".
+ * Mentions the legacy credentials when they are still set: someone upgrading
+ * with SUPABASE_* in their environment would otherwise assume sync still works.
+ */
+export function syncModuleRequiredMessage() {
+    const lines = [
+        'Cross-machine sync needs a sync module (storage.syncModule); none is configured.',
+        '  Set it in ~/.spidersanrc (absolute path or ~/...):  { "storage": { "syncModule": "~/path/to/client.mjs" } }',
+        '  or export SPIDERSAN_SYNC_MODULE=/path/to/client.mjs',
+        '  The module must export createRegistrySyncClient().',
+    ];
+    const env = resolveSupabaseEnv();
+    if (env.url || env.key) {
+        lines.push('  Note: the built-in hosted sync client was removed; SPIDERSAN_SUPABASE_* / SUPABASE_* no longer enable sync.');
+    }
+    return lines;
+}
+//# sourceMappingURL=registry-sync.js.map

package/dist/storage/registry-sync.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"registry-sync.js","sourceRoot":"","sources":["../../src/storage/registry-sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,MAAM,CAAC,KAAK,UAAU,cAAc;IAChC,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;IAC1C,IAAI,CAAC,CAAC,EAAE,CAAC;QACL,mFAAmF;QACnF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;QACpF,CAAC,GAAI,MAAM,CAAC,OAAmC,CAAC,UAAU,CAAC;IAC/D,CAAC;IACD,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,EAAE,CAAC,CAAC;IACxG,OAAO,CAAC,CAAC;AACb,CAAC;AAED,6EAA6E;AAC7E,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACrC,MAAM,GAAG,GAAG,MAAM,cAAc,EAAE,CAAC;IACnC,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,MAAM,CAAC,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,CAA0G,CAAC;IACzJ,IAAI,OAAO,CAAC,CAAC,wBAAwB,KAAK,UAAU,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,6CAA6C,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC,wBAAwB,EAAE,CAAC,CAAC;AACnE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB;IACrC,MAAM,KAAK,GAAG;QACV,kFAAkF;QAClF,+GAA+G;QAC/G,uDAAuD;QACvD,sDAAsD;KACzD,CAAC;IACF,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;IACjC,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC;QACrB,KAAK,CAAC,IAAI,CAAC,+GAA+G,CAAC,CAAC;IAChI,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}

package/dist/storage/supabase.d.ts

@@ -1,16 +1,18 @@
 /**
- * Supabase Storage Adapter
+ * Registry storage with cross-machine sync.
  *
- * Thin compatibility wrapper over a local JsonBranchRegistryStore plus
- * SupabaseRegistrySyncClientImpl for cross-machine sync.
+ * Thin compatibility wrapper over a local JsonBranchRegistryStore plus a
+ * SupabaseRegistrySyncClient supplied by a configured storage.syncModule (the
+ * interface keeps its historical name; any backend can implement it).
  */
 import type { StorageAdapter, Branch } from './adapter.js';
-import { type SupabaseRegistrySyncClientConfig } from './supabase-registry-sync-client-impl.js';
+import type { SupabaseRegistrySyncClient } from './supabase-registry-sync-client.js';
 import type { CrossMachineConflict, MachineIdentity, MachineRegistryView, RegistryStatus, RegistrySyncResult } from '../types/cloud.js';
 export declare class SupabaseStorage implements StorageAdapter {
     private store;
     private syncClient;
-    constructor(config: SupabaseRegistrySyncClientConfig, basePath?: string);
+    /** `syncClient` comes from storage.syncModule; there is no built-in client. */
+    constructor(syncClient: SupabaseRegistrySyncClient, basePath?: string);
     init(): Promise<void>;
     isInitialized(): Promise<boolean>;
     list(): Promise<Branch[]>;

package/dist/storage/supabase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"supabase.d.ts","sourceRoot":"","sources":["../../src/storage/supabase.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EAEH,KAAK,gCAAgC,EACxC,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EACR,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,cAAc,EACd,kBAAkB,EACrB,MAAM,mBAAmB,CAAC;AAE3B,qBAAa,eAAgB,YAAW,cAAc;IAClD,OAAO,CAAC,KAAK,CAA0B;IACvC,OAAO,CAAC,UAAU,CAAiC;gBAEvC,MAAM,EAAE,gCAAgC,EAAE,QAAQ,GAAE,MAAsB;IAKhF,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIzB,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/D,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAItE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI1C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIzC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAI/C,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,aAAa,UAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIlE,YAAY,CACd,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,kBAAkB,CAAC;IAIxB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAIpI,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAI/D,2BAA2B,CAC7B,QAAQ,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,oBAAoB,EAAE,CAAC;CAGrC"}
+{"version":3,"file":"supabase.d.ts","sourceRoot":"","sources":["../../src/storage/supabase.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAErF,OAAO,KAAK,EACR,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,cAAc,EACd,kBAAkB,EACrB,MAAM,mBAAmB,CAAC;AAE3B,qBAAa,eAAgB,YAAW,cAAc;IAClD,OAAO,CAAC,KAAK,CAA0B;IACvC,OAAO,CAAC,UAAU,CAA6B;IAE/C,+EAA+E;gBACnE,UAAU,EAAE,0BAA0B,EAAE,QAAQ,GAAE,MAAsB;IAK9E,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIzB,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/D,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAItE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI1C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIzC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAI/C,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,aAAa,UAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIlE,YAAY,CACd,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,kBAAkB,CAAC;IAIxB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAUpI,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAI/D,2BAA2B,CAC7B,QAAQ,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,oBAAoB,EAAE,CAAC;CAGrC"}

package/dist/storage/supabase.js

@@ -1,17 +1,19 @@
 /**
- * Supabase Storage Adapter
+ * Registry storage with cross-machine sync.
  *
- * Thin compatibility wrapper over a local JsonBranchRegistryStore plus
- * SupabaseRegistrySyncClientImpl for cross-machine sync.
+ * Thin compatibility wrapper over a local JsonBranchRegistryStore plus a
+ * SupabaseRegistrySyncClient supplied by a configured storage.syncModule (the
+ * interface keeps its historical name; any backend can implement it).
  */
 import { JsonBranchRegistryStore } from './json-branch-registry-store.js';
-import { SupabaseRegistrySyncClientImpl, } from './supabase-registry-sync-client-impl.js';
+import { dropShadowedPushRows } from '../lib/push-registry.js';
 export class SupabaseStorage {
     store;
     syncClient;
-    constructor(config, basePath = process.cwd()) {
+    /** `syncClient` comes from storage.syncModule; there is no built-in client. */
+    constructor(syncClient, basePath = process.cwd()) {
         this.store = new JsonBranchRegistryStore(basePath);
-        this.syncClient = new SupabaseRegistrySyncClientImpl(config);
+        this.syncClient = syncClient;
     }
     async init() {
         await this.store.init();
@@ -44,7 +46,13 @@ export class SupabaseStorage {
         return this.syncClient.push(machine, repoName, repoPath, branches);
     }
     async pullRegistries(repoName, excludeMachine, ownBranches) {
-        return this.syncClient.pull(repoName, excludeMachine, ownBranches);
+        // De-duplicate BEFORE excluding the caller's machine, whatever the module does:
+        // the caller's own rows are what shadow a pushed-branch row for a branch it
+        // registered itself. dropShadowedPushRows only filters, so a module that
+        // already de-duplicates gets the same answer.
+        const own = ownBranches ? [...ownBranches] : [];
+        const views = await this.syncClient.pull(repoName, undefined, own);
+        return dropShadowedPushRows(views, own).filter((v) => v.machine_id !== excludeMachine);
     }
     async getRegistryStatus(repoName) {
         return this.syncClient.getStatus(repoName);

package/dist/storage/supabase.js.map

@@ -1 +1 @@
-{"version":3,"file":"supabase.js","sourceRoot":"","sources":["../../src/storage/supabase.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EACH,8BAA8B,GAEjC,MAAM,yCAAyC,CAAC;AASjD,MAAM,OAAO,eAAe;IAChB,KAAK,CAA0B;IAC/B,UAAU,CAAiC;IAEnD,YAAY,MAAwC,EAAE,WAAmB,OAAO,CAAC,GAAG,EAAE;QAClF,IAAI,CAAC,KAAK,GAAG,IAAI,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU,GAAG,IAAI,8BAA8B,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,aAAa;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAoC;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY,EAAE,OAAwB;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAY;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAe;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,SAAe,EAAE,aAAa,GAAG,KAAK;QAChD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,YAAY,CACd,OAAwB,EACxB,QAAgB,EAChB,QAAgB,EAChB,QAAkB;QAElB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,QAA2B,EAAE,cAAuB,EAAE,WAA8B;QACrG,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,QAAiB;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC7B,QAAgB,EAChB,cAAuB;QAEvB,OAAO,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IACjF,CAAC;CACJ"}
+{"version":3,"file":"supabase.js","sourceRoot":"","sources":["../../src/storage/supabase.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAS/D,MAAM,OAAO,eAAe;IAChB,KAAK,CAA0B;IAC/B,UAAU,CAA6B;IAE/C,+EAA+E;IAC/E,YAAY,UAAsC,EAAE,WAAmB,OAAO,CAAC,GAAG,EAAE;QAChF,IAAI,CAAC,KAAK,GAAG,IAAI,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,aAAa;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAoC;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY,EAAE,OAAwB;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAY;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAe;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,SAAe,EAAE,aAAa,GAAG,KAAK;QAChD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,YAAY,CACd,OAAwB,EACxB,QAAgB,EAChB,QAAgB,EAChB,QAAkB;QAElB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,QAA2B,EAAE,cAAuB,EAAE,WAA8B;QACrG,gFAAgF;QAChF,4EAA4E;QAC5E,yEAAyE;QACzE,8CAA8C;QAC9C,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;QACnE,OAAO,oBAAoB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,cAAc,CAAC,CAAC;IAC3F,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,QAAiB;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC7B,QAAgB,EAChB,cAAuB;QAEvB,OAAO,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IACjF,CAAC;CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "spidersan",
-    "version": "0.20.2",
+    "version": "0.22.0",
     "description": "Branch coordination for AI coding agents",
     "type": "module",
     "main": "dist/index.js",