@imenam/mcp-documentor 1.0.72 → 1.0.74

package/dist/src/core/conflict-inspector.d.ts

@@ -20,6 +20,19 @@ export interface ConflictHunk {
     remote: string[];
     /** Common ancestor, present only when the markers were written in diff3 style. */
     base?: string[];
+    /**
+     * The hunk concerns frontmatter, either because it sits inside the YAML block
+     * or because the doc merge driver hoisted a frontmatter disagreement to the
+     * top of the body. Keeping both sides of one of these would duplicate a key,
+     * so that choice is refused rather than silently producing broken YAML.
+     */
+    inFrontmatter: boolean;
+    /**
+     * The hunk is the block the doc merge driver hoisted out of the frontmatter.
+     * Its sides are `key: value` lines that belong back in the YAML, not in the
+     * body where the markers physically sit.
+     */
+    hoisted: boolean;
 }
 export interface ParsedFile {
     lines: string[];

package/dist/src/core/conflict-inspector.js

@@ -34,6 +34,19 @@ export function hasConflictMarkers(text) {
 function sidesFor(operation, first, second) {
     return operation === "rebase" ? { local: second, remote: first } : { local: first, remote: second };
 }
+/**
+ * Line range of the YAML frontmatter block, if the file opens with one.
+ * Returns null when there is none.
+ */
+function frontmatterRange(lines) {
+    if (lines.length === 0 || lines[0].trim() !== "---")
+        return null;
+    for (let i = 1; i < lines.length; i++) {
+        if (lines[i].trim() === "---")
+            return { start: 0, end: i };
+    }
+    return null;
+}
 function sectionFor(lines, hunkStart) {
     for (let i = hunkStart - 1; i >= 0; i--) {
         const match = lines[i].match(HEADING);
@@ -45,6 +58,7 @@ function sectionFor(lines, hunkStart) {
 /** Splits a conflicted file into hunks. Handles both diff3 and plain markers. */
 export function parseConflicts(text, operation) {
     const lines = splitLines(text);
+    const frontmatter = frontmatterRange(lines);
     const hunks = [];
     for (let i = 0; i < lines.length; i++) {
         if (!START.test(lines[i]))
@@ -56,6 +70,7 @@ export function parseConflicts(text, operation) {
         let sawBase = false;
         let closed = false;
         let j = i + 1;
+        const label = lines[i].match(START)?.[1] ?? "";
         for (; j < lines.length; j++) {
             const line = lines[j];
             if (BASE.test(line)) {
@@ -84,6 +99,8 @@ export function parseConflicts(text, operation) {
             local,
             remote,
             ...(sawBase ? { base } : {}),
+            inFrontmatter: label.includes("frontmatter") || (frontmatter !== null && i >= frontmatter.start && i <= frontmatter.end),
+            hoisted: label.includes("frontmatter"),
         });
         i = j;
     }

package/dist/src/core/git-sync.d.ts

@@ -44,13 +44,11 @@ export type PullResult = {
 } | {
     status: "updated";
     changed: string[];
-} | {
-    status: "diverged";
-    ahead: number;
-    behind: number;
+    autoCommitted?: boolean;
 } | {
     status: "conflict";
     conflicted: string[];
+    autoCommitted?: boolean;
 };
 export declare class SyncEngine {
     private storage;
@@ -88,6 +86,15 @@ export declare class SyncEngine {
      */
     pull(): Promise<PullResult>;
     private diffNames;
+    /**
+     * Stages and commits whatever the working tree holds. Committing is what makes
+     * local edits safe to rebase over, so both push and pull go through here
+     * rather than asking the caller to tidy up first.
+     *
+     * .gitignore (written by ensureRepo) excludes all derived and machine-local
+     * state, so `add -A` only ever stages versioned files.
+     */
+    private commitLocalChanges;
     /** Stages versioned files, commits if there is anything to commit, and pushes. */
     push(message?: string): Promise<{
         pushed: boolean;

package/dist/src/core/git-sync.js

@@ -205,20 +205,23 @@ export class SyncEngine {
         }
         // Ensure upstream tracking so status ahead/behind is meaningful.
         await this.git.branch(["--set-upstream-to", `origin/${cfg.branch}`, cfg.branch]).catch(() => { });
-        const status = await this.git.status();
-        if (status.behind === 0)
+        let status = await this.git.status();
+        if (status.behind === 0 && status.files.length === 0)
             return { status: "up-to-date" };
-        // Uncommitted local changes block a safe merge — never risk clobbering them.
-        // Surface as diverged so the user commits/pushes (or stashes) first.
-        if (status.files.length > 0) {
-            return { status: "diverged", ahead: status.ahead, behind: status.behind };
-        }
+        // Uncommitted local edits cannot be rebased over, and reporting the
+        // divergence instead used to strand the caller: the pull asked for a push,
+        // which the remote rejected and which asked for a pull. Committing them
+        // resolves it - the edits become a commit the rebase can replay, nothing is
+        // published, and nothing can be clobbered.
+        const autoCommitted = status.files.length > 0 ? await this.commitLocalChanges() : false;
+        if (autoCommitted)
+            status = await this.git.status();
         const before = await this.git.revparse(["HEAD"]).catch(() => "");
         // Pure behind → fast-forward.
         if (status.ahead === 0) {
             await this.git.merge(["--ff-only", `origin/${cfg.branch}`]);
             const after = await this.git.revparse(["HEAD"]).catch(() => "");
-            return { status: "updated", changed: await this.diffNames(before, after) };
+            return { status: "updated", changed: await this.diffNames(before, after), autoCommitted };
         }
         // Diverged with a clean tree → replay local commits on top of the remote. A
         // conflict stops the rebase with both versions preserved in the index, so it
@@ -229,17 +232,35 @@ export class SyncEngine {
         catch {
             const after = await this.git.status();
             if (after.conflicted.length > 0)
-                return { status: "conflict", conflicted: after.conflicted };
+                return { status: "conflict", conflicted: after.conflicted, autoCommitted };
             throw new Error("Rebase failed without recorded conflicts. Inspect the data directory, or run `git rebase --abort` there to get back to the previous state.");
         }
         const rebased = await this.git.revparse(["HEAD"]).catch(() => "");
-        return { status: "updated", changed: await this.diffNames(before, rebased) };
+        return { status: "updated", changed: await this.diffNames(before, rebased), autoCommitted };
     }
     async diffNames(before, after) {
         if (!before || !after || before === after)
             return [];
         return (await this.git.raw(["diff", "--name-only", before, after])).split("\n").filter(Boolean);
     }
+    /**
+     * Stages and commits whatever the working tree holds. Committing is what makes
+     * local edits safe to rebase over, so both push and pull go through here
+     * rather than asking the caller to tidy up first.
+     *
+     * .gitignore (written by ensureRepo) excludes all derived and machine-local
+     * state, so `add -A` only ever stages versioned files.
+     */
+    async commitLocalChanges(message) {
+        await this.git.add(["-A"]);
+        const status = await this.git.status();
+        const hasWork = status.staged.length > 0 || status.created.length > 0 || status.deleted.length > 0 || status.modified.length > 0;
+        if (!hasWork)
+            return false;
+        const machine = process.env.COMPUTERNAME || process.env.HOSTNAME || "unknown-machine";
+        await this.git.commit(message?.trim() || `docs sync from ${machine} · ${new Date().toISOString()}`);
+        return true;
+    }
     /** Stages versioned files, commits if there is anything to commit, and pushes. */
     async push(message) {
         const cfg = this.requireConfig();
@@ -252,24 +273,14 @@ export class SyncEngine {
             throw new Error(`A ${operation === "none" ? "conflict" : operation} is still unresolved (${pending.conflicted.length} conflicted file(s)). ` +
                 "Resolve it with resolve_sync_conflict before pushing, otherwise the conflict markers would be committed as documentation content.");
         }
-        // .gitignore (written by ensureRepo) excludes all derived/local state,
-        // so -A safely stages only versioned files (projects/, config.json, .gitignore).
-        await this.git.add(["-A"]);
-        const status = await this.git.status();
-        let committed = false;
-        if (status.staged.length > 0 || status.created.length > 0 || status.deleted.length > 0 || status.modified.length > 0) {
-            const machine = process.env.COMPUTERNAME || process.env.HOSTNAME || "unknown-machine";
-            const msg = message?.trim() || `docs sync from ${machine} · ${new Date().toISOString()}`;
-            await this.git.commit(msg);
-            committed = true;
-        }
+        const committed = await this.commitLocalChanges(message);
         try {
             await this.git.push(["-u", "origin", `HEAD:${cfg.branch}`]);
         }
         catch (e) {
             const msg = e instanceof Error ? e.message : String(e);
             if (/fetch first|non-fast-forward|\[rejected\]/i.test(msg)) {
-                throw new Error("Push rejected: the remote has commits you don't have locally. Run pull_docs to integrate them, then push again.");
+                throw new Error("Push rejected: the remote has commits you don't have locally. Run sync_docs, which integrates them and pushes in one step.");
             }
             throw e;
         }

package/dist/src/index.js

@@ -1362,7 +1362,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                             type: "object",
                             properties: {
                                 hunk: { type: "number", description: "Hunk number from get_conflict_hunks" },
-                                take: { type: "string", enum: ["local", "remote", "both", "none", "custom"], description: "'local' this machine, 'remote' the other machine, 'both' concatenates local then remote, 'none' drops the passage, 'custom' uses the provided content" },
+                                take: { type: "string", enum: ["local", "remote", "both", "none", "custom"], description: "'local' this machine, 'remote' the other machine, 'both' concatenates local then remote, 'none' drops the passage, 'custom' uses the provided content. 'both' is refused on frontmatter hunks, where it would duplicate a YAML key." },
                                 content: { type: "string", description: "Replacement text, required when take is 'custom'" },
                             },
                             required: ["hunk", "take"],
@@ -1505,9 +1505,6 @@ async function syncPullOnStartup() {
                 await reindexEmbeddings(storageEngine, embeddingEngine, embeddingStore, {});
             }
         }
-        else if (res.status === "diverged") {
-            logger.warn(`Startup sync: local history diverged (ahead ${res.ahead}, behind ${res.behind}). Started on local data — run sync_status / sync_docs to reconcile.`);
-        }
         else if (res.status === "conflict") {
             logger.warn(`Startup sync: merge conflict in ${res.conflicted.length} file(s). Started on local data — resolve with resolve_sync_conflict.`);
         }

package/dist/src/tools/conflicts.js

@@ -1,3 +1,4 @@
+import matter from "gray-matter";
 import { z } from "zod";
 import { parseConflicts, applyResolutions, preview, hasConflictMarkers } from "../core/conflict-inspector.js";
 const ok = (text) => ({ content: [{ type: "text", text }] });
@@ -73,7 +74,8 @@ export async function getConflictHunks(syncEngine, args) {
             return ok(`None of the requested hunks exist in "${v.path}" (it has ${hunks.length}).`);
         const lines = [`${v.path} — ${wanted.length} of ${hunks.length} hunk(s), during a ${operation}.`, ""];
         for (const hunk of wanted) {
-            lines.push(`Hunk ${hunk.index} — section "${hunk.section}" (line ${hunk.line})`);
+            const scope = hunk.inFrontmatter ? " [frontmatter — \"both\" is not available, it would duplicate a key]" : "";
+            lines.push(`Hunk ${hunk.index} — section "${hunk.section}" (line ${hunk.line})${scope}`);
             if (hunk.base)
                 lines.push(`  [base — what both sides started from]`, preview(hunk.base, v.max_chars_per_side));
             lines.push(`  [local — this machine]`, preview(hunk.local, v.max_chars_per_side));
@@ -112,10 +114,53 @@ export async function resolveConflictHunks(syncEngine, args) {
         if (!hasConflictMarkers(original)) {
             return err(`"${v.path}" has no conflict markers — there is nothing to resolve hunk by hunk.`);
         }
-        const result = applyResolutions(original, operation, decisions);
-        // The invariant is checked against the text itself rather than the hunk
-        // count: staging a file that still holds markers tells git the conflict is
-        // settled and lets the markers be committed as documentation content.
+        // Concatenating both sides of a frontmatter hunk repeats the key it holds,
+        // which makes the YAML unparseable for every reader of the document.
+        const { hunks } = parseConflicts(original, operation);
+        const badBoth = v.decisions.filter((d) => d.take === "both" && hunks.find((h) => h.index === d.hunk)?.inFrontmatter);
+        if (badBoth.length > 0) {
+            return err(`Hunk(s) ${badBoth.map((d) => d.hunk).join(", ")} concern frontmatter, where "both" would duplicate a key and break the YAML. ` +
+                `Use "local", "remote", or "custom" with the single value you want.`);
+        }
+        // A hoisted frontmatter block lives in the body but describes YAML keys.
+        // Applying its chosen side literally would paste "title: X" into the prose
+        // and leave the real frontmatter untouched, so those hunks are dropped from
+        // the body and their values folded back into the frontmatter instead.
+        const frontmatterUpdates = {};
+        const effective = decisions.map((decision) => {
+            const hunk = hunks.find((h) => h.index === decision.index);
+            if (!hunk?.hoisted)
+                return decision;
+            const chosen = decision.take === "local" ? hunk.local
+                : decision.take === "remote" ? hunk.remote
+                    : decision.take === "custom" ? decision.content.split(/\r?\n/)
+                        : [];
+            if (chosen.length > 0) {
+                try {
+                    const asYaml = ["---", ...chosen, "---", ""].join("\n");
+                    Object.assign(frontmatterUpdates, matter(asYaml).data);
+                }
+                catch {
+                    // Not parseable as YAML - leave the frontmatter alone rather than
+                    // corrupting it; the caller still sees the block disappear.
+                }
+            }
+            return { index: decision.index, take: "none" };
+        });
+        const result = applyResolutions(original, operation, effective);
+        if (Object.keys(frontmatterUpdates).length > 0) {
+            try {
+                const parsed = matter(result.text);
+                result.text = matter.stringify(parsed.content, { ...parsed.data, ...frontmatterUpdates });
+            }
+            catch {
+                // Frontmatter still holds markers of its own; it will be rewritten
+                // once those hunks are resolved too.
+            }
+        }
+        // The invariant is checked against the resulting text rather than the hunk
+        // bookkeeping: staging a file that still holds markers tells git the
+        // conflict is settled and lets them be committed as documentation content.
         const settled = !hasConflictMarkers(result.text);
         await syncEngine.writeResolvedFile(v.path, result.text, settled);
         const lines = [`Resolved ${result.applied.length} hunk(s) in "${v.path}".`];

package/dist/src/tools/sync.js

@@ -34,16 +34,23 @@ export async function syncStatus(syncEngine) {
         return err(`Error getting sync status: ${e instanceof Error ? e.message : String(e)}`);
     }
 }
+/**
+ * A pull commits uncommitted local edits before rebasing over them - worth
+ * saying, since the caller did not ask for a commit.
+ */
+function autoCommitNote(autoCommitted) {
+    return autoCommitted
+        ? "Your uncommitted local changes were committed first so they could be replayed on top of the remote.\n"
+        : "";
+}
 function describePull(res) {
     switch (res.status) {
         case "up-to-date":
             return "Already up to date — nothing to pull.";
         case "updated":
-            return `Pulled ${res.changed.length} changed file(s):\n  - ${res.changed.join("\n  - ")}`;
-        case "diverged":
-            return `You have uncommitted local changes while the remote has ${res.behind} new commit(s). No changes applied — your local data is intact. Run push_docs to commit and publish your changes, then pull again.`;
+            return `${autoCommitNote(res.autoCommitted)}Pulled ${res.changed.length} changed file(s):\n  - ${res.changed.join("\n  - ")}`;
         case "conflict":
-            return `Conflict in ${res.conflicted.length} file(s):\n  - ${res.conflicted.join("\n  - ")}\nResolve with resolve_sync_conflict (side "local" keeps this machine version, "remote" keeps the other machine version), or edit these markdown files directly. Then run push_docs.`;
+            return `${autoCommitNote(res.autoCommitted)}Conflict in ${res.conflicted.length} file(s):\n  - ${res.conflicted.join("\n  - ")}\nResolve with resolve_sync_conflict (side "local" keeps this machine version, "remote" keeps the other machine version), or edit these markdown files directly. Then run push_docs.`;
     }
 }
 /** Reindex embeddings for new docs after a successful merge. Best-effort. */
@@ -92,9 +99,9 @@ export async function syncDocs(syncEngine, storageEngine, embeddingEngine, embed
         const v = PushDocsArgs.parse(args);
         const pull = await syncEngine.pull();
         const reindexNote = await reindexAfterPull(pull, storageEngine, embeddingEngine, embeddingStore);
-        // Don't push over a divergence/conflict — surface it so the user can resolve first.
-        if (pull.status === "diverged" || pull.status === "conflict") {
-            return ok(`Pull step:\n${describePull(pull)}${reindexNote}\n\nPush skipped until the above is resolved.`);
+        // Don't push over a conflict — surface it so the caller can resolve first.
+        if (pull.status === "conflict") {
+            return ok(`Pull step:\n${describePull(pull)}${reindexNote}\n\nPush skipped until the conflict is resolved.`);
         }
         const push = await syncEngine.push(v.message);
         return ok(`Pull step: ${describePull(pull)}${reindexNote}\n\nPush step: ${push.message}`);

package/dist/src/version.d.ts

@@ -1 +1 @@
-export declare const APP_VERSION = "1.0.72";
+export declare const APP_VERSION = "1.0.74";

package/dist/src/version.js

@@ -1,2 +1,2 @@
 // Auto-generated version file - do not edit manually
-export const APP_VERSION = '1.0.72';
+export const APP_VERSION = '1.0.74';

package/gui/dist/assets/{arc-KWKRz6LO.js → arc-BNuZ3dSL.js}

@@ -1 +1 @@
-import{a0 as ln,a1 as an,a2 as y,a3 as tn,a4 as H,a5 as q,a6 as _,a7 as un,a8 as rn,a9 as L,aa as o,ab as B,ac as sn,ad as on,ae as fn}from"./index-CdGsMXYw.js";function cn(l){return l.innerRadius}function yn(l){return l.outerRadius}function gn(l){return l.startAngle}function dn(l){return l.endAngle}function mn(l){return l&&l.padAngle}function pn(l,h,I,D,v,A,C,a){var O=I-l,i=D-h,n=C-v,d=a-A,u=d*O-n*i;if(!(u*u<y))return u=(n*(h-A)-d*(l-v))/u,[l+u*O,h+u*i]}function W(l,h,I,D,v,A,C){var a=l-I,O=h-D,i=(C?A:-A)/L(a*a+O*O),n=i*O,d=-i*a,u=l+n,s=h+d,f=I+n,c=D+d,F=(u+f)/2,t=(s+c)/2,m=f-u,g=c-s,R=m*m+g*g,T=v-A,P=u*c-f*s,S=(g<0?-1:1)*L(fn(0,T*T*R-P*P)),j=(P*g-m*S)/R,z=(-P*m-g*S)/R,w=(P*g+m*S)/R,p=(-P*m+g*S)/R,x=j-F,e=z-t,r=w-F,G=p-t;return x*x+e*e>r*r+G*G&&(j=w,z=p),{cx:j,cy:z,x01:-n,y01:-d,x11:j*(v/T-1),y11:z*(v/T-1)}}function hn(){var l=cn,h=yn,I=B(0),D=null,v=gn,A=dn,C=mn,a=null,O=ln(i);function i(){var n,d,u=+l.apply(this,arguments),s=+h.apply(this,arguments),f=v.apply(this,arguments)-an,c=A.apply(this,arguments)-an,F=un(c-f),t=c>f;if(a||(a=n=O()),s<u&&(d=s,s=u,u=d),!(s>y))a.moveTo(0,0);else if(F>tn-y)a.moveTo(s*H(f),s*q(f)),a.arc(0,0,s,f,c,!t),u>y&&(a.moveTo(u*H(c),u*q(c)),a.arc(0,0,u,c,f,t));else{var m=f,g=c,R=f,T=c,P=F,S=F,j=C.apply(this,arguments)/2,z=j>y&&(D?+D.apply(this,arguments):L(u*u+s*s)),w=_(un(s-u)/2,+I.apply(this,arguments)),p=w,x=w,e,r;if(z>y){var G=sn(z/u*q(j)),M=sn(z/s*q(j));(P-=G*2)>y?(G*=t?1:-1,R+=G,T-=G):(P=0,R=T=(f+c)/2),(S-=M*2)>y?(M*=t?1:-1,m+=M,g-=M):(S=0,m=g=(f+c)/2)}var J=s*H(m),K=s*q(m),N=u*H(T),Q=u*q(T);if(w>y){var U=s*H(g),V=s*q(g),X=u*H(R),Y=u*q(R),E;if(F<rn)if(E=pn(J,K,X,Y,U,V,N,Q)){var Z=J-E[0],$=K-E[1],b=U-E[0],k=V-E[1],nn=1/q(on((Z*b+$*k)/(L(Z*Z+$*$)*L(b*b+k*k)))/2),en=L(E[0]*E[0]+E[1]*E[1]);p=_(w,(u-en)/(nn-1)),x=_(w,(s-en)/(nn+1))}else p=x=0}S>y?x>y?(e=W(X,Y,J,K,s,x,t),r=W(U,V,N,Q,s,x,t),a.moveTo(e.cx+e.x01,e.cy+e.y01),x<w?a.arc(e.cx,e.cy,x,o(e.y01,e.x01),o(r.y01,r.x01),!t):(a.arc(e.cx,e.cy,x,o(e.y01,e.x01),o(e.y11,e.x11),!t),a.arc(0,0,s,o(e.cy+e.y11,e.cx+e.x11),o(r.cy+r.y11,r.cx+r.x11),!t),a.arc(r.cx,r.cy,x,o(r.y11,r.x11),o(r.y01,r.x01),!t))):(a.moveTo(J,K),a.arc(0,0,s,m,g,!t)):a.moveTo(J,K),!(u>y)||!(P>y)?a.lineTo(N,Q):p>y?(e=W(N,Q,U,V,u,-p,t),r=W(J,K,X,Y,u,-p,t),a.lineTo(e.cx+e.x01,e.cy+e.y01),p<w?a.arc(e.cx,e.cy,p,o(e.y01,e.x01),o(r.y01,r.x01),!t):(a.arc(e.cx,e.cy,p,o(e.y01,e.x01),o(e.y11,e.x11),!t),a.arc(0,0,u,o(e.cy+e.y11,e.cx+e.x11),o(r.cy+r.y11,r.cx+r.x11),t),a.arc(r.cx,r.cy,p,o(r.y11,r.x11),o(r.y01,r.x01),!t))):a.arc(0,0,u,T,R,t)}if(a.closePath(),n)return a=null,n+""||null}return i.centroid=function(){var n=(+l.apply(this,arguments)+ +h.apply(this,arguments))/2,d=(+v.apply(this,arguments)+ +A.apply(this,arguments))/2-rn/2;return[H(d)*n,q(d)*n]},i.innerRadius=function(n){return arguments.length?(l=typeof n=="function"?n:B(+n),i):l},i.outerRadius=function(n){return arguments.length?(h=typeof n=="function"?n:B(+n),i):h},i.cornerRadius=function(n){return arguments.length?(I=typeof n=="function"?n:B(+n),i):I},i.padRadius=function(n){return arguments.length?(D=n==null?null:typeof n=="function"?n:B(+n),i):D},i.startAngle=function(n){return arguments.length?(v=typeof n=="function"?n:B(+n),i):v},i.endAngle=function(n){return arguments.length?(A=typeof n=="function"?n:B(+n),i):A},i.padAngle=function(n){return arguments.length?(C=typeof n=="function"?n:B(+n),i):C},i.context=function(n){return arguments.length?(a=n??null,i):a},i}export{hn as d};
+import{a0 as ln,a1 as an,a2 as y,a3 as tn,a4 as H,a5 as q,a6 as _,a7 as un,a8 as rn,a9 as L,aa as o,ab as B,ac as sn,ad as on,ae as fn}from"./index-Dub5OLKk.js";function cn(l){return l.innerRadius}function yn(l){return l.outerRadius}function gn(l){return l.startAngle}function dn(l){return l.endAngle}function mn(l){return l&&l.padAngle}function pn(l,h,I,D,v,A,C,a){var O=I-l,i=D-h,n=C-v,d=a-A,u=d*O-n*i;if(!(u*u<y))return u=(n*(h-A)-d*(l-v))/u,[l+u*O,h+u*i]}function W(l,h,I,D,v,A,C){var a=l-I,O=h-D,i=(C?A:-A)/L(a*a+O*O),n=i*O,d=-i*a,u=l+n,s=h+d,f=I+n,c=D+d,F=(u+f)/2,t=(s+c)/2,m=f-u,g=c-s,R=m*m+g*g,T=v-A,P=u*c-f*s,S=(g<0?-1:1)*L(fn(0,T*T*R-P*P)),j=(P*g-m*S)/R,z=(-P*m-g*S)/R,w=(P*g+m*S)/R,p=(-P*m+g*S)/R,x=j-F,e=z-t,r=w-F,G=p-t;return x*x+e*e>r*r+G*G&&(j=w,z=p),{cx:j,cy:z,x01:-n,y01:-d,x11:j*(v/T-1),y11:z*(v/T-1)}}function hn(){var l=cn,h=yn,I=B(0),D=null,v=gn,A=dn,C=mn,a=null,O=ln(i);function i(){var n,d,u=+l.apply(this,arguments),s=+h.apply(this,arguments),f=v.apply(this,arguments)-an,c=A.apply(this,arguments)-an,F=un(c-f),t=c>f;if(a||(a=n=O()),s<u&&(d=s,s=u,u=d),!(s>y))a.moveTo(0,0);else if(F>tn-y)a.moveTo(s*H(f),s*q(f)),a.arc(0,0,s,f,c,!t),u>y&&(a.moveTo(u*H(c),u*q(c)),a.arc(0,0,u,c,f,t));else{var m=f,g=c,R=f,T=c,P=F,S=F,j=C.apply(this,arguments)/2,z=j>y&&(D?+D.apply(this,arguments):L(u*u+s*s)),w=_(un(s-u)/2,+I.apply(this,arguments)),p=w,x=w,e,r;if(z>y){var G=sn(z/u*q(j)),M=sn(z/s*q(j));(P-=G*2)>y?(G*=t?1:-1,R+=G,T-=G):(P=0,R=T=(f+c)/2),(S-=M*2)>y?(M*=t?1:-1,m+=M,g-=M):(S=0,m=g=(f+c)/2)}var J=s*H(m),K=s*q(m),N=u*H(T),Q=u*q(T);if(w>y){var U=s*H(g),V=s*q(g),X=u*H(R),Y=u*q(R),E;if(F<rn)if(E=pn(J,K,X,Y,U,V,N,Q)){var Z=J-E[0],$=K-E[1],b=U-E[0],k=V-E[1],nn=1/q(on((Z*b+$*k)/(L(Z*Z+$*$)*L(b*b+k*k)))/2),en=L(E[0]*E[0]+E[1]*E[1]);p=_(w,(u-en)/(nn-1)),x=_(w,(s-en)/(nn+1))}else p=x=0}S>y?x>y?(e=W(X,Y,J,K,s,x,t),r=W(U,V,N,Q,s,x,t),a.moveTo(e.cx+e.x01,e.cy+e.y01),x<w?a.arc(e.cx,e.cy,x,o(e.y01,e.x01),o(r.y01,r.x01),!t):(a.arc(e.cx,e.cy,x,o(e.y01,e.x01),o(e.y11,e.x11),!t),a.arc(0,0,s,o(e.cy+e.y11,e.cx+e.x11),o(r.cy+r.y11,r.cx+r.x11),!t),a.arc(r.cx,r.cy,x,o(r.y11,r.x11),o(r.y01,r.x01),!t))):(a.moveTo(J,K),a.arc(0,0,s,m,g,!t)):a.moveTo(J,K),!(u>y)||!(P>y)?a.lineTo(N,Q):p>y?(e=W(N,Q,U,V,u,-p,t),r=W(J,K,X,Y,u,-p,t),a.lineTo(e.cx+e.x01,e.cy+e.y01),p<w?a.arc(e.cx,e.cy,p,o(e.y01,e.x01),o(r.y01,r.x01),!t):(a.arc(e.cx,e.cy,p,o(e.y01,e.x01),o(e.y11,e.x11),!t),a.arc(0,0,u,o(e.cy+e.y11,e.cx+e.x11),o(r.cy+r.y11,r.cx+r.x11),t),a.arc(r.cx,r.cy,p,o(r.y11,r.x11),o(r.y01,r.x01),!t))):a.arc(0,0,u,T,R,t)}if(a.closePath(),n)return a=null,n+""||null}return i.centroid=function(){var n=(+l.apply(this,arguments)+ +h.apply(this,arguments))/2,d=(+v.apply(this,arguments)+ +A.apply(this,arguments))/2-rn/2;return[H(d)*n,q(d)*n]},i.innerRadius=function(n){return arguments.length?(l=typeof n=="function"?n:B(+n),i):l},i.outerRadius=function(n){return arguments.length?(h=typeof n=="function"?n:B(+n),i):h},i.cornerRadius=function(n){return arguments.length?(I=typeof n=="function"?n:B(+n),i):I},i.padRadius=function(n){return arguments.length?(D=n==null?null:typeof n=="function"?n:B(+n),i):D},i.startAngle=function(n){return arguments.length?(v=typeof n=="function"?n:B(+n),i):v},i.endAngle=function(n){return arguments.length?(A=typeof n=="function"?n:B(+n),i):A},i.padAngle=function(n){return arguments.length?(C=typeof n=="function"?n:B(+n),i):C},i.context=function(n){return arguments.length?(a=n??null,i):a},i}export{hn as d};