@imenam/mcp-documentor 1.0.71 → 1.0.74

package/dist/src/tools/sync.js

@@ -7,6 +7,15 @@ function err(text) {
     return { content: [{ type: "text", text }], isError: true };
 }
 const NOT_CONFIGURED = "Sync is not configured. Set MCP_DOCUMENTOR_SYNC_REMOTE (and MCP_DOCUMENTOR_SYNC_TOKEN) in the server environment.";
+/**
+ * Names the sides in absolute terms. Git's own "ours"/"theirs" swap meaning
+ * between a merge and a rebase, so they are never surfaced to the agent.
+ */
+function describeOperation(operation) {
+    return operation === "rebase"
+        ? "A rebase is in progress: your local commits are being replayed on top of the remote."
+        : "A merge is in progress: the remote commits are being merged into your branch.";
+}
 export async function syncStatus(syncEngine) {
     try {
         if (!syncEngine.isConfigured())
@@ -14,6 +23,7 @@ export async function syncStatus(syncEngine) {
         const s = await syncEngine.status();
         const lines = [
             `Branch: ${s.branch}`,
+            s.operation === "none" ? "No merge or rebase in progress." : describeOperation(s.operation),
             `Ahead: ${s.ahead} commit(s) · Behind: ${s.behind} commit(s)`,
             s.conflicted.length > 0 ? `Conflicted files (${s.conflicted.length}):\n  - ${s.conflicted.join("\n  - ")}` : "No conflicts.",
             s.dirty.length > 0 ? `Uncommitted changes (${s.dirty.length}):\n  - ${s.dirty.join("\n  - ")}` : "Working tree clean.",
@@ -24,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 to merge.`;
+            return `${autoCommitNote(res.autoCommitted)}Pulled ${res.changed.length} changed file(s):\n  - ${res.changed.join("\n  - ")}`;
         case "conflict":
-            return `Merge conflict in ${res.conflicted.length} file(s):\n  - ${res.conflicted.join("\n  - ")}\nEdit these markdown files to resolve, or use resolve_sync_conflict, then 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. */
@@ -82,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}`);
@@ -93,19 +110,46 @@ export async function syncDocs(syncEngine, storageEngine, embeddingEngine, embed
         return err(`Error syncing docs: ${e instanceof Error ? e.message : String(e)}`);
     }
 }
-const ResolveConflictArgs = z.object({
-    strategy: z.enum(["mine", "theirs"]),
+const ResolveConflictArgs = z
+    .object({
+    side: z.enum(["local", "remote"]).optional(),
+    // Legacy spelling. "mine"/"theirs" mirrored git's flags, which invert under
+    // a rebase - accepted for compatibility, mapped onto the absolute names.
+    strategy: z.enum(["local", "remote", "mine", "theirs"]).optional(),
     paths: z.array(z.string()).optional(),
+})
+    .refine((v) => v.side !== undefined || v.strategy !== undefined, {
+    message: 'Provide "side": either "local" or "remote".',
 });
+function normalizeSide(v) {
+    if (v.side)
+        return v.side;
+    return v.strategy === "remote" || v.strategy === "theirs" ? "remote" : "local";
+}
 export async function resolveSyncConflict(syncEngine, args) {
     try {
         if (!syncEngine.isConfigured())
             return err(NOT_CONFIGURED);
         const v = ResolveConflictArgs.parse(args);
-        const resolved = await syncEngine.resolveConflict(v.strategy, v.paths);
+        const side = normalizeSide(v);
+        const { resolved, operation } = await syncEngine.resolveConflict(side, v.paths);
         if (resolved.length === 0)
             return ok("No conflicted files to resolve.");
-        return ok(`Resolved ${resolved.length} file(s) keeping "${v.strategy}":\n  - ${resolved.join("\n  - ")}\nReview and run push_docs to finalize.`);
+        const kept = side === "local" ? "the local version (this machine)" : "the incoming remote version";
+        const lines = [`Resolved ${resolved.length} file(s) keeping ${kept}:`, `  - ${resolved.join("\n  - ")}`];
+        // Everything staged means the merge or rebase can be carried to completion
+        // right away; leaving it half-finished would block the next sync.
+        const finish = await syncEngine.continueOperation();
+        if (finish.remaining.length > 0) {
+            lines.push(``, `Still conflicted (${finish.remaining.length}):`, `  - ${finish.remaining.join("\n  - ")}`, `Resolve these too, then run resolve_sync_conflict or push_docs again.`);
+        }
+        else if (finish.done && finish.operation !== "none") {
+            lines.push(``, `The ${finish.operation} is complete. Run push_docs to publish.`);
+        }
+        else if (finish.error) {
+            lines.push(``, `The ${finish.operation} could not be completed: ${finish.error}`);
+        }
+        return ok(lines.join("\n"));
     }
     catch (e) {
         return err(`Error resolving conflict: ${e instanceof Error ? e.message : String(e)}`);

package/dist/src/version.d.ts

@@ -1 +1 @@
-export declare const APP_VERSION = "1.0.71";
+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.71';
+export const APP_VERSION = '1.0.74';

package/gui/dist/assets/{arc-Carsq0k3.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-Bjc5MOe1.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};