unfairly 0.8.3 → 0.8.4

package/dist/cmd/parse-share-input.js

@@ -1,56 +1 @@
-// cli/src/cmd/parse-share-input.ts
-//
-// Parse the positional arg to `unfairly connect`. Accepts:
-//   - Full URL:  https://app.unfairly.ai/s/<uuid>
-//   - Short form: s/<uuid>
-//   - Bare UUID:  <uuid>
-//
-// Returns the share_link UUID + the origin (when present in the input)
-// so `connect` can POST to the same host the link came from. A bare UUID
-// or short form yields `origin: null` — callers should fall back to the
-// production app origin.
-const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-export function parseShareInput(input) {
-    if (typeof input !== "string") {
-        throw new Error("share link is required");
-    }
-    const trimmed = input.trim();
-    if (trimmed.length === 0) {
-        throw new Error("share link is required");
-    }
-    // Full URL form: https://host/s/<uuid> (with optional trailing slash / query).
-    if (/^https?:\/\//i.test(trimmed)) {
-        let url;
-        try {
-            url = new URL(trimmed);
-        }
-        catch {
-            throw new Error(`not a valid URL: ${trimmed}`);
-        }
-        const segments = url.pathname.split("/").filter(Boolean);
-        // Expect [..., "s", "<uuid>"] — find the "s/" marker.
-        const sIdx = segments.indexOf("s");
-        if (sIdx === -1 || sIdx === segments.length - 1) {
-            throw new Error(`share link URL must include /s/<id>: ${trimmed}`);
-        }
-        const candidate = segments[sIdx + 1] ?? "";
-        if (!UUID_RE.test(candidate)) {
-            throw new Error(`share id must be a UUID, got "${candidate}"`);
-        }
-        return { shareId: candidate.toLowerCase(), origin: url.origin };
-    }
-    // Short form: s/<uuid>
-    if (/^s\//i.test(trimmed)) {
-        const candidate = trimmed.slice(2);
-        if (!UUID_RE.test(candidate)) {
-            throw new Error(`share id must be a UUID, got "${candidate}"`);
-        }
-        return { shareId: candidate.toLowerCase(), origin: null };
-    }
-    // Bare UUID
-    if (UUID_RE.test(trimmed)) {
-        return { shareId: trimmed.toLowerCase(), origin: null };
-    }
-    throw new Error(`not a recognized share link: "${input}" — expected a URL like https://app.unfairly.ai/s/<uuid>, "s/<uuid>", or a bare UUID`);
-}
-//# sourceMappingURL=parse-share-input.js.map
+const o=/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;function a(t){if(typeof t!="string")throw new Error("share link is required");const r=t.trim();if(r.length===0)throw new Error("share link is required");if(/^https?:\/\//i.test(r)){let e;try{e=new URL(r)}catch{throw new Error(`not a valid URL: ${r}`)}const i=e.pathname.split("/").filter(Boolean),n=i.indexOf("s");if(n===-1||n===i.length-1)throw new Error(`share link URL must include /s/<id>: ${r}`);const s=i[n+1]??"";if(!o.test(s))throw new Error(`share id must be a UUID, got "${s}"`);return{shareId:s.toLowerCase(),origin:e.origin}}if(/^s\//i.test(r)){const e=r.slice(2);if(!o.test(e))throw new Error(`share id must be a UUID, got "${e}"`);return{shareId:e.toLowerCase(),origin:null}}if(o.test(r))return{shareId:r.toLowerCase(),origin:null};throw new Error(`not a recognized share link: "${t}" \u2014 expected a URL like https://app.unfairly.ai/s/<uuid>, "s/<uuid>", or a bare UUID`)}export{a as parseShareInput};

package/dist/cmd/pull.d.ts

@@ -1,2 +1 @@
 export declare function runPull(vaultArg?: string): Promise<void>;
-//# sourceMappingURL=pull.d.ts.map

package/dist/cmd/pull.js

@@ -1,143 +1,7 @@
-import { promises as fs } from "node:fs";
-import path from "node:path";
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
-import { SyncClient } from "../sync/api.js";
-import { readManifest, writeManifest } from "../sync/manifest.js";
-import { buildFileFromServer, writeDocFile } from "../sync/files.js";
-import { getToken } from "../sync/credentials.js";
-import { writeAutoloader } from "../sync/autoloader.js";
-const execFileAsync = promisify(execFile);
-async function gitMv(from, to) {
-    try {
-        await execFileAsync("git", ["mv", from, to], { cwd: process.cwd() });
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-async function tryUnlink(p) {
-    try {
-        await fs.unlink(p);
-    }
-    catch { }
-}
-export async function runPull(vaultArg) {
-    const cwd = process.cwd();
-    const manifest = await readManifest(cwd);
-    if (!manifest) {
-        console.error("No .unfairly/ found. Run `unfairly init` first.");
-        process.exit(1);
-    }
-    const token = await getToken();
-    if (!token) {
-        console.error("No token. Run `unfairly init` to authenticate.");
-        process.exit(1);
-    }
-    const client = new SyncClient(manifest.api_url, token);
-    const targets = vaultArg ? [vaultArg] : Object.keys(manifest.vaults);
-    const failures = [];
-    for (const slug of targets) {
-        const v = manifest.vaults[slug];
-        if (!v) {
-            console.error(`No vault \`${slug}\` in manifest.`);
-            continue;
-        }
-        process.stdout.write(`pulling ${slug}... `);
-        let result;
-        try {
-            result = await client.pullAll(slug, v.last_pulled_at);
-        }
-        catch (err) {
-            // One vault failing shouldn't kill the rest of the pull. For a single-
-            // vault target (`unfairly pull <vault>`) we still want to surface and
-            // exit non-zero — fall through to throw at the end.
-            const message = err.message.split("\n")[0];
-            console.log(`FAILED — ${message}`);
-            failures.push({ slug, message });
-            continue;
-        }
-        // Vault root: track_in_git → .unfairly/{slug}/, else .unfairly/cache/{slug}/
-        const vaultRoot = v.track_in_git ? slug : path.join("cache", slug);
-        const absVaultRoot = path.join(cwd, ".unfairly", vaultRoot);
-        await fs.mkdir(absVaultRoot, { recursive: true });
-        let upserts = 0;
-        let deletes = 0;
-        let renames = 0;
-        let skipped = 0;
-        for (const doc of result.docs) {
-            let file;
-            try {
-                file = buildFileFromServer(doc, vaultRoot);
-            }
-            catch (err) {
-                // One bad doc shouldn't kill the whole pull. Most commonly this is
-                // gray-matter/js-yaml choking on body content that the YAML
-                // serializer mis-parses (e.g. `*Foo` interpreted as an alias). The
-                // doc stays on the server; the user can re-pull after the upstream
-                // doc is sanitized.
-                process.stderr.write(`  · skipped ${doc.slug} — ${err.message.split("\n")[0]}\n`);
-                skipped++;
-                continue;
-            }
-            const relPath = file.path;
-            const absPath = path.join(cwd, ".unfairly", relPath);
-            // Detect rename: same id, different stored path
-            const prev = v.docs[doc.id];
-            if (prev && prev.path !== relPath) {
-                const prevAbs = path.join(cwd, ".unfairly", prev.path);
-                // Tracked vault → use git mv to preserve history
-                if (v.track_in_git) {
-                    await fs.mkdir(path.dirname(absPath), { recursive: true });
-                    const ok = await gitMv(prevAbs, absPath);
-                    if (!ok) {
-                        await tryUnlink(prevAbs);
-                    }
-                }
-                else {
-                    await tryUnlink(prevAbs);
-                }
-                renames++;
-            }
-            await writeDocFile(absPath, file.content);
-            v.docs[doc.id] = {
-                slug: doc.slug,
-                path: relPath,
-                sha: file.sha,
-                updated_at: doc.updated_at,
-                source_type: doc.source_type ?? "markdown",
-            };
-            upserts++;
-        }
-        for (const tomb of result.deleted) {
-            const prev = v.docs[tomb.id];
-            if (!prev)
-                continue;
-            const absPath = path.join(cwd, ".unfairly", prev.path);
-            await tryUnlink(absPath);
-            delete v.docs[tomb.id];
-            deletes++;
-        }
-        v.last_pulled_at = new Date().toISOString();
-        console.log(`+${upserts} -${deletes}${renames ? ` ~${renames}` : ""}${skipped ? ` (skipped ${skipped})` : ""}`);
-    }
-    await writeManifest(cwd, manifest);
-    // Regenerate .unfairly/CLAUDE.md autoloader + .gitignore from the latest mirror.
-    // (init prints the @-import paste instruction; pull stays quiet.)
-    const refreshed = await readManifest(cwd);
-    if (refreshed) {
-        const target = path.join(cwd, ".unfairly");
-        await writeAutoloader(target, refreshed);
-    }
-    if (failures.length > 0) {
-        process.stderr.write(`\n${failures.length} vault${failures.length === 1 ? "" : "s"} failed:\n`);
-        for (const f of failures) {
-            process.stderr.write(`  · ${f.slug} — ${f.message}\n`);
-        }
-        // Single-vault target → propagate so callers/CI see the failure.
-        // Multi-vault → keep what we got but signal partial failure via exit code.
-        process.exitCode = 1;
-    }
-}
-//# sourceMappingURL=pull.js.map
+import{promises as g}from"node:fs";import r from"node:path";import{execFile as A}from"node:child_process";import{promisify as P}from"node:util";import{SyncClient as R}from"../sync/api.js";import{readManifest as b,writeManifest as S}from"../sync/manifest.js";import{buildFileFromServer as D,writeDocFile as M}from"../sync/files.js";import{getToken as N}from"../sync/credentials.js";import{writeAutoloader as C}from"../sync/autoloader.js";const I=P(A);async function O(n,o){try{return await I("git",["mv",n,o],{cwd:process.cwd()}),!0}catch{return!1}}async function h(n){try{await g.unlink(n)}catch{}}async function J(n){const o=process.cwd(),a=await b(o);a||(console.error("No .unfairly/ found. Run `unfairly init` first."),process.exit(1));const y=await N();y||(console.error("No token. Run `unfairly init` to authenticate."),process.exit(1));const j=new R(a.api_url,y),x=n?[n]:Object.keys(a.vaults),c=[];for(const t of x){const i=a.vaults[t];if(!i){console.error(`No vault \`${t}\` in manifest.`);continue}process.stdout.write(`pulling ${t}... `);let f;try{f=await j.pullAll(t,i.last_pulled_at)}catch(e){const s=e.message.split(`
+`)[0];console.log(`FAILED \u2014 ${s}`),c.push({slug:t,message:s});continue}const $=i.track_in_git?t:r.join("cache",t),F=r.join(o,".unfairly",$);await g.mkdir(F,{recursive:!0});let v=0,_=0,p=0,d=0;for(const e of f.docs){let s;try{s=D(e,$)}catch(u){process.stderr.write(`  \xB7 skipped ${e.slug} \u2014 ${u.message.split(`
+`)[0]}
+`),d++;continue}const l=s.path,m=r.join(o,".unfairly",l),w=i.docs[e.id];if(w&&w.path!==l){const u=r.join(o,".unfairly",w.path);i.track_in_git?(await g.mkdir(r.dirname(m),{recursive:!0}),await O(u,m)||await h(u)):await h(u),p++}await M(m,s.content),i.docs[e.id]={slug:e.slug,path:l,sha:s.sha,updated_at:e.updated_at,source_type:e.source_type??"markdown"},v++}for(const e of f.deleted){const s=i.docs[e.id];if(!s)continue;const l=r.join(o,".unfairly",s.path);await h(l),delete i.docs[e.id],_++}i.last_pulled_at=new Date().toISOString(),console.log(`+${v} -${_}${p?` ~${p}`:""}${d?` (skipped ${d})`:""}`)}await S(o,a);const k=await b(o);if(k){const t=r.join(o,".unfairly");await C(t,k)}if(c.length>0){process.stderr.write(`
+${c.length} vault${c.length===1?"":"s"} failed:
+`);for(const t of c)process.stderr.write(`  \xB7 ${t.slug} \u2014 ${t.message}
+`);process.exitCode=1}}export{J as runPull};

package/dist/cmd/push.d.ts

@@ -1,2 +1 @@
 export declare function runPush(vaultArg?: string): Promise<void>;
-//# sourceMappingURL=push.d.ts.map

package/dist/cmd/push.js

@@ -1,85 +1 @@
-import { promises as fs } from "node:fs";
-import path from "node:path";
-import { SyncClient } from "../sync/api.js";
-import { readManifest, writeManifest } from "../sync/manifest.js";
-import { computeSha, readDocFile, readDocRaw } from "../sync/files.js";
-import { buildConflictFile } from "../sync/conflict.js";
-import { getToken } from "../sync/credentials.js";
-export async function runPush(vaultArg) {
-    const cwd = process.cwd();
-    const manifest = await readManifest(cwd);
-    if (!manifest) {
-        console.error("No .unfairly/ found. Run `unfairly init` first.");
-        process.exit(1);
-    }
-    const token = await getToken();
-    if (!token) {
-        console.error("No token. Run `unfairly init` to authenticate.");
-        process.exit(1);
-    }
-    const client = new SyncClient(manifest.api_url, token);
-    const targets = vaultArg ? [vaultArg] : Object.keys(manifest.vaults);
-    let conflicts = 0;
-    let pushed = 0;
-    for (const slug of targets) {
-        const v = manifest.vaults[slug];
-        if (!v) {
-            console.error(`No vault \`${slug}\` in manifest.`);
-            continue;
-        }
-        for (const [docId, entry] of Object.entries(v.docs)) {
-            const absPath = path.join(cwd, ".unfairly", entry.path);
-            let raw;
-            let local;
-            try {
-                raw = await readDocRaw(absPath);
-                local = await readDocFile(absPath);
-            }
-            catch {
-                // File missing locally — Phase 1 punt: skip (delete-locally not handled)
-                continue;
-            }
-            const currentSha = computeSha(raw);
-            if (currentSha === entry.sha)
-                continue; // not dirty
-            const result = await client.push({
-                vault: slug,
-                doc_id: docId,
-                expected_updated_at: entry.updated_at,
-                body: local.body,
-                client_frontmatter: local.frontmatter,
-            });
-            if (result.status === 200 && "ok" in result.data) {
-                const { updated_at, rejected_frontmatter } = result.data;
-                entry.sha = currentSha;
-                entry.updated_at = updated_at;
-                pushed++;
-                if (rejected_frontmatter.length > 0) {
-                    console.warn(`! ${entry.path}: server kept ${rejected_frontmatter.map((r) => r.key).join(", ")} (your changes ignored)`);
-                }
-            }
-            else if (result.status === 409 && "server_body" in result.data) {
-                const d = result.data;
-                const conflictContent = buildConflictFile({
-                    serverFrontmatter: d.server_frontmatter,
-                    localBody: local.body,
-                    serverBody: d.server_body,
-                    serverUpdatedAt: d.server_updated_at,
-                });
-                await fs.writeFile(absPath, conflictContent, "utf8");
-                // Update entry's known updated_at to the server's so a resolve+push works
-                entry.updated_at = d.server_updated_at;
-                console.warn(`! conflict: ${entry.path} (server updated ${d.server_updated_at}). Edit to remove merge markers, then \`unfairly resolve <path>\` and \`unfairly push\`.`);
-                conflicts++;
-            }
-            else {
-                const err = "error" in result.data ? result.data.error : "unknown";
-                console.error(`push failed for ${entry.path}: ${err}`);
-            }
-        }
-        v.last_pushed_at = new Date().toISOString();
-    }
-    await writeManifest(cwd, manifest);
-    console.log(`pushed ${pushed}, conflicts ${conflicts}`);
-}
-//# sourceMappingURL=push.js.map
+import{promises as b}from"node:fs";import k from"node:path";import{SyncClient as $}from"../sync/api.js";import{readManifest as g,writeManifest as j}from"../sync/manifest.js";import{computeSha as S,readDocFile as x,readDocRaw as F}from"../sync/files.js";import{buildConflictFile as C}from"../sync/conflict.js";import{getToken as D}from"../sync/credentials.js";async function E(l){const s=process.cwd(),r=await g(s);r||(console.error("No .unfairly/ found. Run `unfairly init` first."),process.exit(1));const u=await D();u||(console.error("No token. Run `unfairly init` to authenticate."),process.exit(1));const _=new $(r.api_url,u),y=l?[l]:Object.keys(r.vaults);let f=0,p=0;for(const i of y){const c=r.vaults[i];if(!c){console.error(`No vault \`${i}\` in manifest.`);continue}for(const[w,t]of Object.entries(c.docs)){const d=k.join(s,".unfairly",t.path);let m,a;try{m=await F(d),a=await x(d)}catch{continue}const h=S(m);if(h===t.sha)continue;const o=await _.push({vault:i,doc_id:w,expected_updated_at:t.updated_at,body:a.body,client_frontmatter:a.frontmatter});if(o.status===200&&"ok"in o.data){const{updated_at:e,rejected_frontmatter:n}=o.data;t.sha=h,t.updated_at=e,p++,n.length>0&&console.warn(`! ${t.path}: server kept ${n.map(v=>v.key).join(", ")} (your changes ignored)`)}else if(o.status===409&&"server_body"in o.data){const e=o.data,n=C({serverFrontmatter:e.server_frontmatter,localBody:a.body,serverBody:e.server_body,serverUpdatedAt:e.server_updated_at});await b.writeFile(d,n,"utf8"),t.updated_at=e.server_updated_at,console.warn(`! conflict: ${t.path} (server updated ${e.server_updated_at}). Edit to remove merge markers, then \`unfairly resolve <path>\` and \`unfairly push\`.`),f++}else{const e="error"in o.data?o.data.error:"unknown";console.error(`push failed for ${t.path}: ${e}`)}}c.last_pushed_at=new Date().toISOString()}await j(s,r),console.log(`pushed ${p}, conflicts ${f}`)}export{E as runPush};

package/dist/cmd/resolve.d.ts

@@ -1,2 +1 @@
 export declare function runResolve(relOrAbsPath: string): Promise<void>;
-//# sourceMappingURL=resolve.d.ts.map

package/dist/cmd/resolve.js

@@ -1,35 +1 @@
-import path from "node:path";
-import { promises as fs } from "node:fs";
-import { readManifest } from "../sync/manifest.js";
-export async function runResolve(relOrAbsPath) {
-    const cwd = process.cwd();
-    const manifest = await readManifest(cwd);
-    if (!manifest) {
-        console.error("No .unfairly/ found.");
-        process.exit(1);
-    }
-    const abs = path.isAbsolute(relOrAbsPath)
-        ? relOrAbsPath
-        : path.join(cwd, relOrAbsPath);
-    const raw = await fs.readFile(abs, "utf8");
-    if (raw.includes("<<<<<<< local") || raw.includes(">>>>>>> cloud")) {
-        console.error("Merge markers still present. Edit the file to remove them, then re-run resolve.");
-        process.exit(1);
-    }
-    // Verify the file is in the manifest. We do NOT mutate entry.sha — leaving
-    // the pre-conflict sha lets `push` detect the resolved content as dirty
-    // and ship it. entry.updated_at was already advanced to server's during
-    // the conflict, so the next push's expected_updated_at will match.
-    const relPath = path.relative(path.join(cwd, ".unfairly"), abs);
-    for (const v of Object.values(manifest.vaults)) {
-        for (const [, entry] of Object.entries(v.docs)) {
-            if (entry.path === relPath) {
-                console.log(`markers cleared. Run \`unfairly push\` to broadcast.`);
-                return;
-            }
-        }
-    }
-    console.error("path not found in manifest");
-    process.exit(1);
-}
-//# sourceMappingURL=resolve.js.map
+import e from"node:path";import{promises as l}from"node:fs";import{readManifest as f}from"../sync/manifest.js";async function m(o){const r=process.cwd(),s=await f(r);s||(console.error("No .unfairly/ found."),process.exit(1));const t=e.isAbsolute(o)?o:e.join(r,o),n=await l.readFile(t,"utf8");(n.includes("<<<<<<< local")||n.includes(">>>>>>> cloud"))&&(console.error("Merge markers still present. Edit the file to remove them, then re-run resolve."),process.exit(1));const i=e.relative(e.join(r,".unfairly"),t);for(const c of Object.values(s.vaults))for(const[,a]of Object.entries(c.docs))if(a.path===i){console.log("markers cleared. Run `unfairly push` to broadcast.");return}console.error("path not found in manifest"),process.exit(1)}export{m as runResolve};

package/dist/cmd/setup.d.ts

@@ -19,4 +19,3 @@ export type SetupOutcome = {
     };
 };
 export declare function runSetup(opts?: SetupOptions): Promise<SetupOutcome>;
-//# sourceMappingURL=setup.d.ts.map